Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,852 Commits 3 Branches 0 Tags 1 GiB
5d5ae16fe5
Commit Graph

31182 Commits

Author SHA1 Message Date
Marica
e8e9bc4daa
Merge pull request #29733 from dj12djdjs/fix-user-unique-cart 
fix(e-commerce): Unique Shopping Cart Per Logged In User
 2022-02-25 16:35:14 +05:30
Deepesh Garg
5464ba6430
Merge branch 'develop' into psoa_account_filter 2022-02-25 15:55:06 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check 
fix: Make abbreviation limit to 10
 2022-02-25 15:52:51 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Saqib Ansari
69c34cd7ae fix(pos): mode of payment disappears after save 2022-02-25 14:36:29 +05:30
marination
d3b0ca30c6 fix: Get MRs that are yet to be received but fully ordered in Report 
- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)
 2022-02-25 12:10:11 +05:30
Rucha Mahabal
04b9091821
fix: web form deletion 2022-02-24 18:10:29 +05:30
Rucha Mahabal
761e528ba3
fix: deprecation warning 2022-02-24 17:57:39 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit 2022-02-24 17:03:52 +05:30
marination
6d72aa377f feat: Combine Sub-assembly items in Production Plan 
- Combine subassembly rows if same Item, Warehouse, Inhouse/Outhouse Manu.g, BOM No.
 2022-02-24 15:20:18 +05:30
Saqib Ansari
2f1709dfef
chore: remove unintentional search index 2022-02-24 15:12:35 +05:30
Saqib Ansari
1e139cf9a1
chore: remove unintentional search index 2022-02-24 15:12:12 +05:30
Deepesh Garg
0373914704 fix: Commission not applied while making Sales Order from Quotation 2022-02-24 14:42:56 +05:30
Deepesh Garg
b1a46c80d5 fix: Total taxes and charges in payment entry for multicurrency payments 2022-02-24 13:11:17 +05:30
Deepesh Garg
239733acd1 fix: Make abbreviation limit to 10 2022-02-23 20:41:49 +05:30
Marica
4d8d4acec4
Merge pull request #29913 from marination/item-merge-bundles 
fix: Block merging items if both have product bundles
 2022-02-23 16:59:22 +05:30
marination
a33f04ea41 fix: Check if both old and new items have bundles before merging 
- If only one has bundle against it, they can be merged
 2022-02-23 16:26:20 +05:30
Ankush Menat
b44cead317
test: fix flaky stateful tests (#29749) 
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
 2022-02-23 16:17:41 +05:30
Marica
8b1ef7bcc6
Merge pull request #29964 from marination/fox-flaky-stock-reports-test 
chore: Rollback after each test, due to premature commit via `remove_user_permission`
 2022-02-23 15:18:39 +05:30
marination
5ff3705872 test: Make Variant if absent in test_variant_work_order, keep test atomic 2022-02-23 14:54:16 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
marination
bf8743713d chore: Rollback after each test, due to premature commit via remove_user_permission 
- `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion
- Execution of background job eventually commits
- While in the test suite it runs sequentially in the same thread and commits whatever was done until then
- Which is why the rollback in `tearDownClass` is quite useless here
- This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db
- This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen
- Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction
 2022-02-23 14:03:48 +05:30
Marica
857ac8c045
Merge branch 'develop' into item-merge-bundles 2022-02-23 13:01:56 +05:30
Marica
856d3f63b5
Merge pull request #29953 from marination/heart-icon-and-shop-by-category 
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
 2022-02-23 13:01:30 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes 
fix: Validate party account with company
 2022-02-23 11:22:08 +05:30
Suraj Shetty
aaa84a21ba fix: Email translations 2022-02-23 10:54:44 +05:30
Saqib Ansari
8743e39469 fix: sider 
(cherry picked from commit bc28755978c17d7e85cdc5ffd4a45a629183e2c8)
 2022-02-23 03:55:49 +00:00
Saqib Ansari
3dcc3a349e fix: cannot edit valutaion_rate in asset repair 
(cherry picked from commit 2aba6c38b36e5fce373800eb129a93eb010c691f)
 2022-02-23 03:55:49 +00:00
Saqib Ansari
414c3b8dd2 fix: remove redundant method 
(cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)
 2022-02-23 03:55:48 +00:00
GangaManoj
5d3b65b944 fix: Pass value instead of array 
(cherry picked from commit e1a9b61103e27099696ae4b186a6575b28c16b06)
 2022-02-23 03:55:48 +00:00
GangaManoj
3d6ed4ebde fix: Fetch valuation rate 
(cherry picked from commit df71907be453a481a43d2c62a5c076602ab8af07)
 2022-02-23 03:55:48 +00:00
Marica
0fde2f522e
Merge branch 'develop' into item-merge-bundles 2022-02-23 00:28:51 +05:30
marination
714325071f fix: Remove accidental as_dict in frappe.db.get_all 2022-02-23 00:15:39 +05:30
marination
b0a1cd6a7b chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon 
- `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke
- Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now
 2022-02-23 00:13:44 +05:30
Deepesh Garg
a61790c00f fix: Remove unintended changes 2022-02-22 20:58:10 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco 
feat: Bank Reconciliation for loan documents
 2022-02-22 20:43:00 +05:30
Deepesh Garg
60a006fdaf
Merge pull request #29942 from nemesis189/taxjar-fixes 
fix: Taxjar minor fixes
 2022-02-22 19:37:56 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest (#29945) 
Basically failfast=False but for sub-tests
 2022-02-22 19:24:49 +05:30
Saqib Ansari
3ee1383802
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-22 18:45:31 +05:30
Subin Tom
1682a26fe6 fix: Taxjar minor fixes 2022-02-22 17:20:48 +05:30
Ankush Menat
745f7bc5f0
docs: add human readable specifications for stock ledger (#29308) 
* docs: add human readable specifications for stock ledger

* docs: reposting technical implementation notes
 2022-02-22 17:03:11 +05:30
Ankush Menat
7f55226a58
fix: remove customer field value when MR is not customer provided (#29938) 2022-02-22 16:55:43 +05:30
Deepesh Garg
3a547cb0d9 fix: Item discounts for quotation 2022-02-22 16:25:32 +05:30
Saqib Ansari
8e3f1e306d test: po updates packed item's ordered_qty 2022-02-22 15:34:26 +05:30
Saqib Ansari
8005fee656 feat: update ordered qty for packed items 2022-02-22 15:06:19 +05:30
Saqib Ansari
2a69730a40
Merge pull request #29900 from nextchamp-saqib/asset-fix-#3 
fix(asset): no. of depr booked cannot be equal to total no. of depr
 2022-02-22 14:23:19 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change (#29917) 
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
 2022-02-22 12:53:46 +05:30
Rucha Mahabal
d011a3f82c
fix(Salary Slip): TypeError while clearing any amount field in components (#29931) 2022-02-22 11:41:09 +05:30
Deepesh Garg
70b960e650 fix: Account filter in PSOA 2022-02-22 09:16:08 +05:30
Rucha Mahabal
4738367d64
fix: boarding task dates not set when activity begins on is set to 0 (#29921) 2022-02-21 22:54:46 +05:30
Rucha Mahabal
87b59fc96c
fix(LMS): program enrollment does not give any feedback (#29922) 2022-02-21 22:53:29 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Sagar Sharma
e4c4dc402e
fix: JobCard TimeLog to_date (#29872) 2022-02-21 19:49:19 +05:30
Deepesh Garg
0c6835eab2
Merge pull request #29740 from deepeshgarg007/gross_profit_non_stock_item 
fix: Multiple fixes in Gross Profit report
 2022-02-21 19:28:55 +05:30
Ankush Menat
9661058cc7 fix: only set batchwise valuation flag if new batch 2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7 fix: batchwise valuation can only be used by FIFO/LIFO 2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698 test: force correct flag in test data 2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703 fix: check if Moving average item can use batchwise valuation 2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063 test: mixed moving average items 2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad fix: reset stock value if no qty 2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3 fix: extend round_off_if_near_zero fix to other methods 2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e test: old/new mix batches valuation consumption 2022-02-21 18:02:40 +05:30
Ankush Menat
b1555fd477 chore: batch flag and consumption rate in invariant report 2022-02-21 18:02:40 +05:30
Ankush Menat
b534fee2c7 refactor: use queue difference instead of actual values 2022-02-21 18:02:40 +05:30
Ankush Menat
aba7a7ce4e fix: handle negative inventory inside a batch 2022-02-21 18:02:40 +05:30
Ankush Menat
d7ca83ef0b refactor: code duplication for fallback rates 2022-02-21 18:02:40 +05:30
Ankush Menat
c5bd34d238 test: multi-batch stock entry 2022-02-21 18:02:40 +05:30
Ankush Menat
60b8bae85f test: batch wise valuation for transfer and intermediate 2022-02-21 18:02:40 +05:30
Ankush Menat
5718777a2b fix: consider batch_no when getting incoming rate 2022-02-21 18:02:40 +05:30
18alantom
683ef8a603 test: more tests for batchwise valuation 
Co-Authored-By: Ankush Menat <ankush@frappe.io>
 2022-02-21 18:02:40 +05:30
Ankush Menat
312db429e4 refactor: use qb for patching flag 2022-02-21 18:02:40 +05:30
Ankush Menat
d130233ffc test: fix expected test failures 2022-02-21 18:02:40 +05:30
Ankush Menat
102fff24c8 refactor: convert query to QB and make creation optional 2022-02-21 18:02:40 +05:30
Ankush Menat
ab926521bd fix: correct incoming rate for batched items 2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise 
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
 2022-02-21 18:02:40 +05:30
Ankush Menat
ce0514c8db feat: batch wise valuation rates 
start with most used case: negative inventory isn't enabled

- simple addition of qty and value when new batch qty is added
- fetch outgoing rate from stock movement of specific batch
 2022-02-21 18:02:40 +05:30
18alantom
f4af75f60b feat: batchwise valuation flag 
This is required to avoid breaking behaviour in valuation
of old batches
 2022-02-21 18:02:40 +05:30
Saqib Ansari
05682af07a
Merge branch 'develop' into asset-fix-#3 2022-02-21 17:55:32 +05:30
Ankush Menat
00e8565868 fix: round off increments in numeric item variant 2022-02-21 17:42:34 +05:30
Deepesh Garg
a4c6cb9f12 fix: Remove print statements 2022-02-21 17:08:25 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 16:56:49 +05:30
marination
530f9f7029 test: Item Merging with Product Bundles 2022-02-21 16:48:04 +05:30
marination
28cc2dbb72 fix: Block merging items if both have product bundles 2022-02-21 16:14:40 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount 
fix: Total Credit amount in TDS Payable monthly report
 2022-02-21 15:33:58 +05:30
Ankush Menat
afc81351b7 test: only test erpnext doctypes 
Co-authored-by: gavin <gavin18d@gmail.com>
 2022-02-21 15:32:28 +05:30
Ankush Menat
e3ea431ef3 test: test all form loads 2022-02-21 15:32:28 +05:30
Ankush Menat
3a5dbfab50 fix: make cashflow mapping template child doctype 2022-02-21 15:32:28 +05:30
Saqib Ansari
cecaec2cc6
Merge branch 'develop' into asset-fix-#3 2022-02-21 14:54:56 +05:30
Deepesh Garg
170a657ed8
Merge pull request #29887 from deepeshgarg007/loan_interest_principal 
fix: Ledger entries on LIA for term loans
 2022-02-21 14:24:37 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item (#29903) 2022-02-21 14:22:14 +05:30
Deepesh Garg
a82cf7214e fix: Total Credit amount in TDS Payable monthly report 2022-02-21 13:58:56 +05:30
Deepesh Garg
e24242ee33
Merge branch 'develop' into loan_interest_principal 2022-02-21 13:39:45 +05:30
Saqib Ansari
780694f6e2 test: number_of_depr_booked = total_number_of_depr 2022-02-21 12:45:52 +05:30
Saqib Ansari
c5808543c8 fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations 2022-02-21 12:41:08 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 12:34:14 +05:30
Deepesh Garg
0b5e618e3a fix: Update bank reconciliation statement 2022-02-21 11:46:44 +05:30
Deepesh Garg
295cbb0ff2 fix: Update queries in Bank Reconciliation Tool 2022-02-21 11:45:23 +05:30
Deepesh Garg
a0bdcbd0cd fix: Add patch for account fields 2022-02-21 11:44:00 +05:30
Saqib Ansari
fa38c291bd fix(pos): removal of coupon code 2022-02-21 11:38:16 +05:30
rohitwaghchaure
6956578339
Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error 
fix: Error in consolidated financial statements
 2022-02-20 18:21:54 +05:30
Deepesh Garg
83a60a2a17
Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter 
fix: GSTIN filter for GSTR-1 report
 2022-02-19 19:41:49 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js 2022-02-19 19:35:57 +05:30
Deepesh Garg
1aa12fb3f1 fix: Ledger entries on LIA for term loans 2022-02-19 19:19:32 +05:30
rohitwaghchaure
b9072eb9b8
Merge pull request #29773 from wojosc/patch-26 
Translation for DocType
 2022-02-19 16:37:25 +05:30
Deepesh Garg
5a2b571aa9 fix: Validate party account with company 2022-02-18 20:05:49 +05:30
Marica
d1a283fd79
Merge branch 'develop' into repack-entry-stock-ageing 2022-02-18 18:54:23 +05:30
marination
d5be536740 test: Negative Stock, over consumption & over production with split rows, balance precision 2022-02-18 18:53:05 +05:30
marination
ed4a6c6cc6 fix: Range Qty precision 2022-02-18 18:52:42 +05:30
marination
d3fbbcfed3 fix: Precision of available qty and negative stock in transfer bucket 
- Maintain only positive values in transfer bucket
- Use it to neutralize/add stock to fifo queue
 2022-02-18 16:33:28 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error 2022-02-17 23:32:50 +05:30
Deepesh Garg
e1f8f034c2 Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes 2022-02-17 23:20:29 +05:30
Deepesh Garg
3a966d4dbe fix: Move patch to post sync 2022-02-17 23:18:07 +05:30
Deepesh Garg
1617e0d0e6 fix: Remove reload doc 2022-02-17 22:52:53 +05:30
Deepesh Garg
87b074ac09 fix: GSTIN filter for GSTR-1 report 2022-02-17 22:01:00 +05:30
Ankush Menat
c36bd7e1a6 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
 2022-02-17 19:52:01 +05:30
Deepesh Garg
555b1335f6 feat: Bank Reconciliation for loan documents 2022-02-17 19:15:30 +05:30
Rucha Mahabal
bef46e2b64 chore: remove unused code and fields related to workstation from Timesheet Detail 2022-02-17 17:48:18 +05:30
Rucha Mahabal
47ff968253 test: timesheet not overlapping with continuous timelogs 2022-02-17 17:48:18 +05:30
Rucha Mahabal
3ec9acf8f7 fix: convert overlap raw query to frappe.qb 2022-02-17 17:48:18 +05:30
Rucha Mahabal
e2e998fbd9 fix(Timesheet): convert time logs to datetime while checking for overlap 2022-02-17 17:48:18 +05:30
ChillarAnand
358734dcea fix: Skip deletion if linked docs exists 2022-02-17 16:31:27 +05:30
Saqib Ansari
9a7f9c3668
Merge pull request #29859 from nextchamp-saqib/fix-pos-coupon-code 
fix: coupon code is applied even if ignore_pricing_rule is enabled
 2022-02-17 16:11:19 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
ChillarAnand
b3d4465db6 Merge branch 'develop' into remove-nonprofit 2022-02-17 15:30:11 +05:30
ChillarAnand
fb59247182 fix: Delete party type records in patch 2022-02-17 15:15:44 +05:30
Ankush Menat
db93f26f20 fix: production plan status should consider qty + WO status 2022-02-17 14:48:32 +05:30
rohitwaghchaure
0da39950d8
Merge pull request #29836 from rohitwaghchaure/minor-item-name-in-excel-sheet 
feat (minor): added item name in the excel sheet
 2022-02-17 14:37:51 +05:30
Saqib Ansari
680f8c4dc2
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency 
fix: currency in bank reconciliation tool
 2022-02-17 14:27:07 +05:30
Saqib Ansari
60674e52b8 fix: currency in bank reconciliation tool 2022-02-17 14:19:42 +05:30
ChillarAnand
db1957ffe6 Merge branch 'develop' into remove-nonprofit 2022-02-17 13:00:58 +05:30
ChillarAnand
b5ff9b27bd refactor: Clean up non-profit setup 2022-02-17 12:37:25 +05:30
Ankush Menat
d9fc3f3d90 test: putaway rule re-application shouldn't do anything 2022-02-17 12:26:51 +05:30
Ankush Menat
b000e93744 fix: avoid updating items table if no change due to putaway 2022-02-17 12:26:51 +05:30
ChillarAnand
72fe559031 refactor: Remove non profit templates 2022-02-17 08:42:32 +05:30
Rohit Waghchaure
02e77029fa fix: added item name in the excel sheet 2022-02-16 18:15:57 +05:30
marination
06d36c6143 chore: Move patch that updates SO from WO to v13 2022-02-16 17:40:16 +05:30
Wolfram Schmidt
235b0715bf
fix: allow renaming and merging (#29830) 2022-02-16 17:20:07 +05:30
Deepesh Garg
d251bec380
Merge pull request #29137 from ruthra-kumar/payment_terms_report 
feat: Payment Terms Status report
 2022-02-16 14:15:24 +05:30
Marica
c3c9a8d445
Merge branch 'develop' into so-mr-wo-back-update 2022-02-16 13:39:58 +05:30
Marica
201a38bfbf
Merge branch 'develop' into item-variants-perf 2022-02-16 13:03:32 +05:30
Kenneth Sequeira
a26183e205
fix: add supported currencies (#29805) 2022-02-16 13:02:36 +05:30
Marica
0ba72b133f
Merge branch 'develop' into repack-entry-stock-ageing 2022-02-16 12:48:51 +05:30
Marica
3fcf0ec81d
Merge branch 'develop' into so-mr-wo-back-update 2022-02-16 12:44:56 +05:30
marination
29c576e144 chore: Remove commented out code 2022-02-16 12:41:39 +05:30
Sagar Vora
08a391fa88
test: set correct DocType (#29819) 2022-02-16 10:56:57 +05:30
Deepesh Garg
2f5bfcc055
Merge branch 'develop' into payment_terms_report 2022-02-16 10:06:12 +05:30
marination
f6233e77c6 chore: Add transfer bucket working to .md file 2022-02-15 20:30:16 +05:30
marination
ea3b7de867 test: Stock Ageing FIFO buckets for Repack entry with same item 2022-02-15 18:41:42 +05:30
marination
799671c748 fix: Transfer Bucket logic for Repack Entry with split batch rows 2022-02-15 18:41:08 +05:30