Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,626 Commits 3 Branches 0 Tags 1 GiB
003cfe2717
Commit Graph

4893 Commits

Author SHA1 Message Date
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom 2021-08-24 08:50:49 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no 2021-08-23 18:07:22 +05:30
Rohit Waghchaure
e1f070437a fix: selected batch no changed on updation of qty 2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4 fix: stock ledger report not working if include uom selected in filter 2021-08-23 13:36:13 +05:30
18alantom
810bce8da2 Merge branch 'develop' into update-stock-onboarding-fp 2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5 refactor: use Form Tour doc instead of controller form tour 
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
 2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172 fix: minor changes 
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
 2021-08-20 16:21:33 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate 
fix: Shopping cart Exchange rate validation
 2021-08-20 10:56:10 +05:30
marination
45617ae22f fix: Shopping cart Exchange rate validation 
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
 2021-08-19 20:01:05 +05:30
Noah Jacob
cf8d2d97dd fix: Incorrect mandatory error message for warehouse 2021-08-19 15:43:20 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
18alantom
cc177f3415 fix: wo tests, sider, account for pl in se validation 2021-08-17 16:49:00 +05:30
18alantom
55acb2e843 fix: sider 2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4 fix: add more validations, remove source wh req for pl item 2021-08-17 16:36:32 +05:30
18alantom
8ecb146231 test: add bom tests for process loss val, add se test for qty calc 2021-08-17 16:36:24 +05:30
18alantom
3df8d0cdf0 fix: add warehouse and unset is scrap for process loss items 2021-08-17 16:29:42 +05:30
18alantom
b6dc0efa27 feat: add provision for process loss in manufac 2021-08-17 16:23:19 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
18alantom
f7b747e19c refactor: reduce steps, reword cards 2021-08-16 15:14:36 +05:30
18alantom
599c1024a2 fix: semgrep, remove trailing and leading whitespaces 2021-08-16 15:14:22 +05:30
18alantom
95992a7ea5 refactor: fix typo, remove target warehouse cause SE Type dependency 2021-08-16 15:13:45 +05:30
18alantom
37466631f2 refactor: reorder steps according to stock settings refactor 2021-08-16 15:13:14 +05:30
18alantom
9581836885 refactor: add watch video step for stock opening balance 2021-08-16 15:13:05 +05:30
18alantom
1d67d20185 refactor: remove DN, PR; change wording, add/remove steps in tour 2021-08-16 15:12:57 +05:30
18alantom
51d2317bb5 refactor: sider/semgrep 2021-08-16 15:12:28 +05:30
18alantom
1851232e3c refactor: move trailing whitespace out of translate func 2021-08-16 15:12:23 +05:30
18alantom
0b669b3d7e refactor: add form tour for stock module onboarding 2021-08-16 15:12:16 +05:30
18alantom
23e1d2b536 refactor: update stock onboarding 2021-08-16 15:12:09 +05:30
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting 
feat: Enable discount accounting
 2021-08-14 18:05:29 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Marica
2e6899fbe4 fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)
 2021-08-13 10:08:41 +00:00
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values
 2021-08-13 15:37:45 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None (#26920) 2021-08-12 20:03:28 +05:30
Marica
08e4026456 fix: Stock Analytics Report must consider warehouse during calculation (#26908) 
* fix: Stock Analytics Report must consider warehouse during calculation

* fix: Brand filter in Stock Analytics

(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
 2021-08-12 05:02:42 +00:00
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-11 22:28:34 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Marica
42899d69ea
Merge branch 'develop' into stock-analytics 2021-08-11 18:44:29 +05:30
Ankush
9152715f90
perf: various minor perf fixes for ledger postings (#26775) 
* perf: only validate if voucher is journal entry

* perf: optimize merge GLE

- Order fields such that comparison will fail faster
- Break out of loops if not matched

* perf: don't try to match SLE if count mismatch

* refactor: simplify initialize_previous_data

* perf: use cache for fetching valuation_method

These are set only once fields

* refactor: simplify get_future_stock_vouchers

* refactor: simplify get_voucherwise_gl_entries

* perf: fetch only required fields for GL comparison

`select *` fetches all fields, output of this function is only used for
comparing.

* perf: reorder conditions in PL cost center check

* perf: reduce query while validating new gle

* perf: use cache for validating warehouse props

These properties don't change often, no need to query everytime.

* perf: use cached stock settings to validate SLE

* docs: update misleading docstring

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-11 11:17:50 +05:30
marination
eb2050b407 fix: Brand filter in Stock Analytics 2021-08-10 20:37:09 +05:30
marination
55d8aaf0b6 fix: Stock Analytics Report must consider warehouse during calculation 2021-08-10 19:01:05 +05:30
Marica
173c4c8564
Merge branch 'develop' into test-asset-lcv 2021-08-10 14:38:31 +05:30
marination
510e31952d test: Serial no sanitation 2021-08-10 14:35:51 +05:30
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +05:30
Marica
fd12f65047
Merge pull request #26854 from marination/asset-lcv-gl-entry-hotfix 
fix: Faulty Gl Entry for Asset LCVs (#26803)
 2021-08-10 14:07:12 +05:30
marination
948386d85d test: Serial no sanitation 2021-08-10 14:00:55 +05:30
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space 2021-08-10 13:17:08 +05:30
marination
06b6b7e3cc fix: Set CWIP Account in company at the start to avoid flaky test 2021-08-10 13:14:32 +05:30
marination
9ca2febd88 fix: Set CWIP Account in company at the start to avoid flaky test 2021-08-10 13:10:46 +05:30
Deepesh Garg
25a2f2b90e
Merge pull request #26579 from deepeshgarg007/discount_accounting_v13 
feat: Enable discount accounting
 2021-08-10 11:48:14 +05:30
rohitwaghchaure
c5e7673277
Merge pull request #26814 from noahjacob/mr_allowance_feat_v13 
feat: over transfer allowance for material transfers (bp #26264)
 2021-08-10 11:32:43 +05:30
Deepesh Garg
9b561ea839 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13 2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-10 10:34:39 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms 2021-08-10 09:32:08 +05:30
Deepesh Garg
bcf56e64ba fix: Ignore default payment term templates when coping payment terms from orders 2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-09 18:53:13 +05:30
Ankush
9f5111809d
test: fix flaky purchase receipt test (#26859) (#26860) 
# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-08-09 15:35:26 +05:30
Ankush
7ba8c821a1
test: fix flaky purchase receipt test (#26859) 2021-08-09 15:14:26 +05:30
Frappe PR Bot
ea83e2b45f
fix: validate python expressions (#26835) (#26856) 
(cherry picked from commit 07337d5c78)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 14:48:59 +05:30
Ankush
07337d5c78
fix: validate python expressions (#26835) 2021-08-09 12:38:40 +05:30
Marica
a8166c06c7 fix: Faulty Gl Entry for Asset LCVs (#26803) 
* fix: Faulty Gl Entry for Asset LCVs

- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into

* fix: Use keyword arguments instead of positional for better readability

* chore: Test for LCV for draft asset created via Purchase Receipt
 2021-08-09 12:38:12 +05:30
Marica
ab8f0cab4d
fix: Faulty Gl Entry for Asset LCVs (#26803) 
* fix: Faulty Gl Entry for Asset LCVs

- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into

* fix: Use keyword arguments instead of positional for better readability

* chore: Test for LCV for draft asset created via Purchase Receipt
 2021-08-09 12:24:04 +05:30
Frappe PR Bot
210441d9b5
fix: price list with 0 value are ignored (bp #26655) 
* fix: price list with 0 value are ignored

Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
   zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
   would've changed.

Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.

* refactor: make get_price_list_rate function pure

(cherry picked from commit 16d4de5130)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 11:34:33 +05:30
Marica
4c929b6994
Merge branch 'develop' into serial-no-space 2021-08-09 10:50:09 +05:30
Ankush
16d4de5130
fix: price list with 0 value are ignored (#26655) 
* fix: price list with 0 value are ignored

Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
   zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
   would've changed.

Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.

* refactor: make get_price_list_rate function pure
 2021-08-09 10:41:24 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Frappe PR Bot
aec7846407
test: fix pricelist tests (#26839) (#26840) 
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.

(cherry picked from commit 27a29eb6bc)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:55:01 +05:30
Ankush
27a29eb6bc
test: fix pricelist tests (#26839) 
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.
 2021-08-06 21:34:44 +05:30
Frappe PR Bot
9ea24db20a
test: use item that allows fractional UOM in test (#26837) (#26838) 
(cherry picked from commit 614336fe1d)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:14:40 +05:30
Ankush
614336fe1d
test: use item that allows fractional UOM in test (#26837) 2021-08-06 19:36:21 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Frappe PR Bot
2e352834a2
fix: fetching of item tax from hsn code (#26736) (#26792) 
* fix: fetching of item tax from hsn code

(cherry picked from commit 3a50490c04)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-08-06 10:59:29 +05:30
GangaManoj
0b11420147 fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-05 00:35:45 +05:30
GangaManoj
23c104555b fix: Remove irrelevant code 2021-08-05 00:28:42 +05:30
Noah Jacob
673bc58193 test: test case for over transfer of materials 2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c feat: over transfer allowance for material transfers 2021-08-04 18:48:24 +05:30
Frappe PR Bot
85815f989c
fix: Reset weight_per_unit on replacing Item (#26619) (#26791) 
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details

* fix: Set weight_uom in get_item_details as Item's default weight_uom

(cherry picked from commit 471f48f64d)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
 2021-08-03 20:06:07 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code (#26736) 
* fix: fetching of item tax from hsn code
 2021-08-03 15:57:11 +05:30
Ganga Manoj
471f48f64d
fix: Reset weight_per_unit on replacing Item (#26619) 
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details

* fix: Set weight_uom in get_item_details as Item's default weight_uom
 2021-08-03 14:39:38 +05:30
Frappe PR Bot
373ed1f65c
fix: remove limit from stock balance report (#26773) (#26779) 
(cherry picked from commit b3740e9afc)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-03 13:28:50 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-08-02 21:11:50 +05:30
Subin Tom
8800aaaee7 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-08-02 20:36:37 +05:30
Ankush
b3740e9afc
fix: remove limit from stock balance report (#26773) 2021-08-02 20:13:26 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation (#26680) 2021-08-02 11:01:30 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt 
fix: COGS account in purchase receipt
 2021-07-31 14:50:47 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock 2021-07-29 19:54:56 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:50:00 +05:30
rohitwaghchaure
b7bbefee15
Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:49:42 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:12 +05:30
marination
533ee9a401 feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse 
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
 2021-07-29 19:39:32 +05:30
GangaManoj
57df4a3aa1 fix: Rename tests 2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:27:52 +05:30
GangaManoj
293c5e10c3 fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30