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

30993 Commits

Author SHA1 Message Date
Deepesh Garg
ef69d1fd38 test: Add test case for repayment against partially disbursed loans 2022-02-07 17:00:30 +05:30
Deepesh Garg
fab7f90e8f
Merge pull request #29460 from deepeshgarg007/loan_refund_jv 
feat: Refund entry against loans
 2022-02-07 14:37:47 +05:30
Deepesh Garg
8ece2845f2 fix: Add disbursement accounts to tests 2022-02-07 13:50:31 +05:30
Ankush Menat
5e6227e3d8
fix(ux): make stock entry type the title field (#29674) 2022-02-07 13:19:08 +05:30
Deepesh Garg
8d7331de8f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_refund_jv 2022-02-07 12:49:34 +05:30
Deepesh Garg
4284017e9d
fix: Copyright info 2022-02-07 12:26:01 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category 
feat: option to disable Item Tax Template and Tax Category
 2022-02-07 11:01:03 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings (#29638) 
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.

* chore: undo changes to creation timestamp

happened because of a bug in fw

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
 2022-02-07 10:42:55 +05:30
Deepesh Garg
ff57450e77 fix: Replace ORM with query builder 2022-02-06 22:56:12 +05:30
Deepesh Garg
36f4fb0585 fix: Incorrect tax template in Sales Invocie via data import 
(cherry picked from commit 20f321a88980d231f52702e3d32e122022316152)
 2022-02-06 16:24:26 +00:00
Rucha Mahabal
4e3a13117e
Merge branch 'develop' into fix-earned-leaves-allocation 2022-02-06 20:31:48 +05:30
Rucha Mahabal
e25544f94e fix(test): add ignore duplicates flag to allocation function 2022-02-06 20:30:46 +05:30
Ankush Menat
f089d39675 refactor: better method name 
Co-authored-by: gavin <gavin18d@gmail.com>
 2022-02-06 20:12:15 +05:30
Ankush Menat
3e5f940686 test: e2e test for LIFO valuation 2022-02-06 20:12:15 +05:30
Ankush Menat
61c5ad44d3 refactor: get incoming fifo/lifo rate functions 
Re-use same logic for computing incoming rate.
 2022-02-06 20:12:15 +05:30
Ankush Menat
97e18a1cd0 feat: allow selecting LIFO valuation 2022-02-06 20:12:11 +05:30
Ankush Menat
9c49d2d3aa feat: LIFOValuation class for handling LIFO 2022-02-06 20:12:11 +05:30
Ankush Menat
b855030e7c refactor: valuation class to allow extending 2022-02-06 20:12:11 +05:30
Deepesh Garg
0b9c066ef7
Merge pull request #29609 from deepeshgarg007/gstr_3b_export_zero_rated 
fix: Zero rated exports in GSTR-3B report
 2022-02-06 19:34:21 +05:30
Deepesh Garg
81b967851a
Merge pull request #29601 from deepeshgarg007/provisonal_loss_bs 
fix: Incorrect provisional profit and loss in balance sheet
 2022-02-06 19:33:12 +05:30
Deepesh Garg
5d09678954
Merge pull request #29659 from deepeshgarg007/zero_amount_status 
fix: Billing status for zero amount ref doc
 2022-02-06 19:22:31 +05:30
Deepesh Garg
8ff32da9bd
Merge branch 'develop' into gstr_3b_export_zero_rated 2022-02-06 19:11:03 +05:30
Ankush Menat
6459ceaea1 fix: dont show cancelled PO items in plan report 2022-02-06 19:05:12 +05:30
Deepesh Garg
3e6fade08d
Merge pull request #29641 from deepeshgarg007/jv_cancel_ignore 
fix: Ignore linked invoices on Journal Entry cancel
 2022-02-06 18:57:13 +05:30
Abhinav Raut
d0043bdbac fix: missing key in loan 2022-02-06 16:55:24 +05:30
Deepesh Garg
c5726fd3da fix: Add test case 2022-02-06 11:35:40 +05:30
Deepesh Garg
d679692472 fix: Billing status for zero amount ref doc 2022-02-06 11:35:23 +05:30
Ankush Menat
d1f5753885 test: check when PR moves stock from neg to pos 2022-02-05 23:35:28 +05:30
Ankush Menat
c88c368880 fix: dont ignore items that dont have SVD 
When items go from negative to positive stock value diff can be zero but
item might have taxes / need divisional loss adjustment.
 2022-02-05 22:54:18 +05:30
Ankush Menat
69c65afd72 test: regression test for LCV GL entries 2022-02-05 20:58:56 +05:30
Ankush Menat
8858c703a8 fix: ignore cancelled svd while updating GLE for PR 
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.
 2022-02-05 20:58:56 +05:30
Rucha Mahabal
a52ba0a544 fix: linter 2022-02-05 16:40:55 +05:30
Rucha Mahabal
63ee4f1b64 test: earned leave allocation for passed months and allocation on month-end 2022-02-05 16:05:54 +05:30
Rucha Mahabal
25c7f850b1 fix: earned leaves not allocated if assignment is created on month-end 2022-02-05 16:05:46 +05:30
Marica
a49b755773
Merge branch 'develop' into packed-items-new-doc 2022-02-04 22:58:21 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category 2022-02-04 18:10:39 +01:00
Rucha Mahabal
65923bd856
fix: enable Allow on Submit for 'Is Active' field in Salary Structure (#29630) 2022-02-04 22:34:11 +05:30
marination
bd41a99c8a fix: Regenerate packed items on newly mapped doc 
- Cannot determine action on newly mapped DN that hasnt been inserted
- Rows could have been deleted, updated, added, etc. before first save
- In this case , reset packing table
 2022-02-04 22:06:56 +05:30
Deepesh Garg
6f7ae62907 fix: Ignore linked invoices on Journal Entry cancel 2022-02-04 20:13:20 +05:30
marination
26bd3053d1 perf: Weed out disabled variants via sql query instead of pythonic looping separately 
- If the number of variants are large (almost 2lakhs), the query to get variants and attribute data takes time
- If the no.of disabled attributes is large as well, the list comprehension weeding out disabled variants takes forever
- We dont need to loop over the variants data so many times
- Avoid any `if a in list(b)` is best when the iterables have tremendous data
 2022-02-04 17:38:20 +05:30
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-04 10:20:43 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic 
fix: Incorrect packing list for recurring items & code cleanup
 2022-02-03 22:09:52 +05:30
Marica
5e5a18f17c
Merge branch 'develop' into fix-web-portal 2022-02-03 21:59:57 +05:30
marination
017a882f90 fix: Remove cart.js from erpnext-web bundle 
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
 2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05 fix: Load control & dialog assets with cart.js 
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
 2022-02-03 20:06:24 +05:30
Wolfram Schmidt
68cea75909
chore: update de.csv #29575 
added missing translations in Company Master

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@tueit.de>

[skip ci]
 2022-02-03 20:05:11 +05:30
Wolfram Schmidt
af7570410e
chore: update de.csv (#29624) 
minor translation error

[skip ci]
 2022-02-03 20:04:24 +05:30
Ankush Menat
ba847ef218
Merge branch 'develop' into provisonal_loss_bs 2022-02-03 17:18:00 +05:30
Ankush Menat
04f6426dbf
feat: show stock value difference in stock ledger report (#29607) 2022-02-03 17:14:57 +05:30
marination
f18ec2d947 fix: (Linter) import sequence 2022-02-03 17:07:11 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic 2022-02-03 17:02:57 +05:30
marination
4e7b4dc9a8 test: Packed Items test file 2022-02-03 17:01:33 +05:30
Ankush Menat
9b60e3f187
fix: default qty if not found 2022-02-03 15:26:57 +05:30
Sagar Sharma
be09551cfa test: add test case for multiple WO 
(cherry picked from commit 36609c50c0332498ee088e6f44759f7c2747c733)
 2022-02-03 09:50:08 +00:00
Sagar Sharma
360a06b9ba fix: ordered_qty for production-plan-item 
(cherry picked from commit 4e58c1da3ac1649d64377d53aec68e489a4a9d41)
 2022-02-03 09:50:07 +00:00
Ankush Menat
551f2967da
Merge pull request #27923 from marination/e-commerce-refactor-develop 
refactor: E-commerce (port to develop)
 2022-02-03 14:14:08 +05:30
gavin
7eb9dc01f8 fix: Ignore mandatory fields if exist (#27871) 
The goal of this fix is to not break the patch in case of customizations
In this particular case, it's regarding a customized Note DocType with
multiple custom mandatory fields
 2022-02-03 14:08:32 +05:30
Ankush Menat
bd3b47fd50 fix: remove stale doctypes and add msg for ecommerce refactor (#27700) 2022-02-03 14:06:31 +05:30
marination
f97642e975 fix: Qb query, use isin instead of in and access fields without dot notation due to reserved pypika keywords 2022-02-03 14:03:17 +05:30
Ankush Menat
41a95e5624
fix: ignore empty customer/supplier in item query (#29610) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier
 2022-02-03 13:02:13 +05:30
marination
f47db26fa6 fix: Cart buttons not working 
- Add cart.js to web bundle
- Hide icon conditionally since now this file loads on every single page
 2022-02-03 12:54:59 +05:30
Deepesh Garg
233e6449fc fix: Zero rated exports in GSTR-3B report 2022-02-03 12:13:43 +05:30
Deepesh Garg
ed2c6b6637 fix: Incorrect provisional profit and loss in balance sheet 2022-02-02 22:36:45 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
Marica
384e6b559b
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 21:10:04 +05:30
Subin Tom
ccf63124d6 fix: Coupon code item pricing dynamic updation issue 2022-02-02 20:13:33 +05:30
Saqib Ansari
e082e3f702 fix(pos): pricing rule on transactions doesn't work 2022-02-02 19:33:48 +05:30
Rucha Mahabal
da7494c208
fix: Program Enrollment tests (#29592) 2022-02-02 17:30:29 +05:30
Deepesh Garg
ffec865e00 fix: Make a deep copy of GLE 2022-02-02 17:14:42 +05:30
Deepesh Garg
f1c3bcee1f fix: Deadlock on making reverse GL Entries 2022-02-02 17:09:34 +05:30
marination
4b62d2d7fe fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip 2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 10:45:14 +05:30
marination
8c90c505c0 fix: (minor) build issues on cart and item page 
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
 2022-02-02 10:40:45 +05:30
Nabin Hait
bf3caab63c fix: future recurring period calculation 2022-02-01 23:42:50 +05:30
Nabin Hait
008b331f49 Merge branch 'cc-allocation' into develop 2022-02-01 22:27:23 +05:30
Nabin Hait
81d1ad6059 fix: Allocation percentage fieldtype changed to percent 2022-02-01 22:26:39 +05:30
Nabin Hait
364856b7c5 fix: patch for migrating cost center allocations 2022-02-01 22:26:03 +05:30
Nabin Hait
5f03292aba
fix: Future recurring period calculation for addl salary (#29578) 2022-02-01 21:47:15 +05:30
Rucha Mahabal
1710aef0a9
fix: employee reminders fixes (#29548) 2022-02-01 19:46:39 +05:30
Ankush Menat
a3a05c0c23
fix: don't show "create" on cancelled BOMs (#29570) 2022-02-01 17:40:06 +05:30
Saqib Ansari
4055cc76a7
Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items 
feat: Allowing non stock items in POS
 2022-02-01 16:36:10 +05:30
Rucha Mahabal
0dde0ece10
fix: leave application tests (#29539) 2022-02-01 16:00:02 +05:30
Saqib Ansari
bf70feb7c9 fix: flaky test 2022-02-01 15:26:33 +05:30
Deepesh Garg
528c71382f
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
 2022-02-01 14:42:55 +05:30
ruthra kumar
9bd56b0f79 fix: typeerror on invoice creation from SO/PO 2022-02-01 14:14:04 +05:30
Saqib Ansari
4e4159ec06 chore: remove unused import 2022-02-01 14:02:52 +05:30
Saqib Ansari
2aca54eb38 chore: remove useless rollback 2022-02-01 13:17:01 +05:30
Saqib Ansari
650d44a714 test: point of sale search 2022-02-01 13:14:28 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items 2022-02-01 12:25:25 +05:30
Deepesh Garg
cb3754a102
Merge pull request #29535 from ruchamahabal/fix-loan-repayment 
fix: do not hide Loan Repayment Entry field in salary slip
 2022-02-01 12:18:47 +05:30
marination
9eeddc28b0 fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931 2022-02-01 12:15:48 +05:30
marination
2933cf243a fix: Failing test, sider and linter 
- Remove unused imports
- fix test `test_product_list_attribute_filter_builder`
 2022-02-01 12:08:33 +05:30
rohitwaghchaure
62e5aa7d72
Merge pull request #29359 from KrithiRamani/foc_item 
fix: bypass selling price validation for free item
 2022-02-01 11:54:01 +05:30
Deepesh Garg
fa2b3eb414
Merge branch 'develop' into fix-loan-repayment 2022-02-01 11:12:39 +05:30
marination
1d7f313b92 debug: CI 2022-02-01 11:12:05 +05:30
marination
00752ca01d fix: Wrong variable name breaks Cart Items rendering 2022-02-01 11:11:58 +05:30
marination
143ff715e7 fix: (test) set user for price test 2022-02-01 11:11:38 +05:30
marination
606f23b667 fix: Sider and Linter 2022-02-01 11:11:29 +05:30
marination
4f7ec25bbe tests: Variant without web item price fetch and add to cart 
- Also, optionally get image from template web item for cart if variant has no image
 2022-02-01 11:11:18 +05:30
marination
47c8ad0b94 fix: Cart Logic of Item variant without Website Item 2022-02-01 11:11:11 +05:30
marination
f2fbe9049f fix: Server Side test - teardown correctly 2022-02-01 11:10:04 +05:30
marination
2623046ba7 test: Variant Selector - Fetch next valid Attribute values fetching after selection of one 2022-02-01 11:09:46 +05:30
Sagar Sharma
c53cdce1c0 chore: remove patch 
(cherry picked from commit fedeb2a70f80a39d31cb928d9876fbc94f27561c)

# Conflicts:
#	erpnext/patches.txt
 2022-02-01 05:39:39 +00:00
Sagar Sharma
ce0b84f54d refactor: use frappe.qb instead of sql 
(cherry picked from commit 0a9ec9f591f8b4d0e630a3c902b69c9996f080dd)
 2022-02-01 05:39:39 +00:00
Sagar Sharma
edbf52ab95 feat: add patch 
(cherry picked from commit fc65a3d9895c8ba9de957da820ed6b59c6c1bcbd)

# Conflicts:
#	erpnext/patches.txt
 2022-02-01 05:39:38 +00:00
Sagar Sharma
1fd8539873 fix: check so_detail before dn_detail 
(cherry picked from commit 5de6b8dc4df407fd953efe69640e22bd4ea90b6e)
 2022-02-01 05:39:38 +00:00
Sagar Sharma
b50036c04a fix: consider returned_qty while updating billed_amt 
(cherry picked from commit 63aaa1e357280b24c537a502a479f7bb7a6654e4)
 2022-02-01 05:39:37 +00:00
marination
5a462db207 test: Variant Selector - Attribute Value fetching 2022-02-01 11:09:35 +05:30
marination
6c7b3026c9 fix: Behaviour if Item Variants Cache generation 
- Revert to old behaviour where variant doesnt need to be published
- Delete unused functions
 2022-02-01 11:08:30 +05:30
marination
20c71edc84 fix: Exclude unpublished items while fetching items from other item groups 2022-02-01 11:07:53 +05:30
Devin Slauenwhite
28e0c1acdc fix(ux): tripple digit cart qty 2022-02-01 11:07:33 +05:30
Devin Slauenwhite
49cdf9b7b0 fix(e-commerce): shopping cart total quantity (#29076) 
* fix: shopping cart total quantity

* fix: linter error
 2022-02-01 11:06:33 +05:30
marination
45fadb5235 fix: Faulty 'continue' not setting value in db 2022-02-01 11:03:12 +05:30
marination
091a07c6df fix: Code cleanup 2022-02-01 11:03:05 +05:30
marination
31a2485bcd fix: Sider 2022-02-01 11:02:59 +05:30
marination
456f27724c fix: Convert Item links to Website Item links in Item Card Group template data 
- Changed link option to Website Item in Item card group template
- patch to convert pre-existing data
 2022-02-01 11:02:48 +05:30
Devin Slauenwhite
262fcbd9fb fix(test): e-commerce fetch logged-in user item price. 2022-02-01 11:00:37 +05:30
Devin Slauenwhite
18e70e8229 test: e-commerce customer pricing rule 2022-02-01 11:00:28 +05:30
Devin Slauenwhite
282fbf4b07 fix: fetch correct selling price. 2022-02-01 10:59:57 +05:30
Dany Robert
d4c74b546d fix: no module named 'redisearch' (#28818) 
* chore: rename file to avoid the overriding

* fix: rename ref #1

* fix: rename ref in e_commerce_settings

* fix: rename ref in product_search.py

* chore: rename rsearch.py to redisearch_utils.py

* chore: rename rsearch to redisearch_utils in product_search
 2022-02-01 10:58:18 +05:30
marination
02d92070be fix: search_box_id instead of search_box_class 2022-02-01 10:55:37 +05:30
marination
6583a83dd3 fix: Sider (missing semicolon) 2022-02-01 10:55:27 +05:30
marination
f63f250630 feat: Allow addition of custom search box 
- allow passing custom search box class to bind search actions on
- this allows users to inject and get a custom search box running on any page
 2022-02-01 10:55:05 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test 
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
 2022-02-01 10:51:50 +05:30
Marica
19e5dfbb7c
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-01 00:56:11 +05:30
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports 
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
 2022-02-01 00:03:08 +05:30
Deepesh Garg
dcd99a82cb
Merge pull request #29536 from nabinhait/cost-center-allocation 
feat: Cost Center Allocation
 2022-01-31 21:27:15 +05:30
Nabin Hait
5b0ec6437b fix: sider issues 2022-01-31 18:41:42 +05:30
Nabin Hait
6099af5d00 fix: Fixed test case and sider issues 2022-01-31 17:43:37 +05:30
Ankush Menat
bba31a37f4 fix: missing validate_item_group_defaults function 2022-01-31 17:15:17 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Nabin Hait
3dadfc9048 patch: Removed files and code related to old distributed cost center feature 2022-01-31 15:58:40 +05:30
rohitwaghchaure
f026ec6bad
Merge pull request #29522 from ankush/drop_bom_level 
refactor!: dynamically compute bom_level
 2022-01-31 15:58:25 +05:30
Ankush Menat
a254201696
chore: revert manual handling of stock level section (#29537) 2022-01-31 15:37:19 +05:30
Rucha Mahabal
1361f88f67 fix: do not hide Loan Repayment Entry field in salary slip 2022-01-31 14:53:13 +05:30
Ankush Menat
5aa1b6bc38
Merge pull request #29519 from ankush/unique_bin 
fix: bin uniqueness
 2022-01-31 14:29:22 +05:30
Ankush Menat
0a15334464 fix: update reserved qty for production/ s/c 2022-01-31 14:10:42 +05:30
Nabin Hait
c09d5a613e fix: Delete old fields from cost center related to distributed cost center 2022-01-31 13:26:09 +05:30
Nabin Hait
ce49e6ccf7 fix: Resolved conflicts in patches 2022-01-31 13:25:44 +05:30
Nabin Hait
174104c0d4 feat: Workspace link for Cost Center Allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
004c1ed094 feat: Split Gl Entry based on cost center allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
ac2e19103f Cost Center Allocation doctype, validations and test cases 2022-01-31 13:24:18 +05:30
Nabin Hait
d71d3e3b3e fix: Minor issues in existing patches 2022-01-31 13:24:18 +05:30
Subin Tom
05bbb69d0e
fix: Validation for invalid serial nos at POS invoice level (#29447) 2022-01-31 13:08:19 +05:30
Anupam Kumar
896adc3759
fix: not able to declare opportunity lost without competitors (#29531) 2022-01-31 12:09:54 +05:30
Saqib Ansari
6b377703b3
Merge pull request #29454 from nextchamp-saqib/fix-dn-mapping 
fix(sales order): incorrect no. of items fetched while creating dn
 2022-01-31 11:38:57 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing 
revert: "refactor!: drop e-invoicing integration from erpnext"
 2022-01-31 11:35:48 +05:30
Himanshu
319322228a
fix: fetch image form item (#29523) 2022-01-31 10:56:00 +05:30
Ankush Menat
d38fd8635c fix(ux): sort multi-production item plans correctly 2022-01-30 22:58:30 +05:30
Ankush Menat
157b4b33fe refactor!: dynamically compute bom_level 2022-01-30 22:06:24 +05:30
aaronmenezes
0f7c2a19de
fix: cost of poor quality report time filters not working (#28958) 
* fix: cost of poor quality report time filters not working

* chore:update cost of poor quality report to use query builder

* fix: linter warnings

* chore: updated report query

* chore: added test filters

* fix : cleared linter warnings

* chore: formatting

* refactor: query generation

- optionally apply date filters
- join instead of expensive sub-query
- return as dictionary

* test: simplify test

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-30 20:22:39 +05:30
Ankush Menat
c2ecc7a2d1 refactor: patch for fixing broken bins 
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.
 2022-01-30 18:43:02 +05:30
Sagar Sharma
7ff3ca25e5 fix(patch): patch duplicate bins 2022-01-30 18:43:02 +05:30
Ankush Menat
a1e7771cdd fix: ignore None item/wh whie updating reservation 2022-01-30 18:43:02 +05:30
Ankush Menat
08810dbcce fix: add unique constraint on bin at db level 2022-01-30 18:42:59 +05:30
smehata
b818b93568
Update sales_invoice.js (#29491) 
undefined issue
 2022-01-30 17:27:20 +05:30
Deepesh Garg
d41f71acb7
Merge pull request #29499 from deepeshgarg007/overseas_gst_tax 
fix(India): Tax calculation for overseas suppliers
 2022-01-30 11:36:54 +05:30
Anupam Kumar
925eca0e4a
fix: multiple CRM fixes (#29507) 
* fix: multiple CRM fixes
 2022-01-29 22:32:03 +05:30
Rucha Mahabal
0d5993d288
Merge branch 'develop' into fix-interview-ratings 2022-01-29 21:24:46 +05:30
Rucha Mahabal
d98290bfb9 test: get interview details for applicant dashboard 
- rectify tests as per new rating field changes (fractional and configurable)
 2022-01-29 21:15:49 +05:30
Rucha Mahabal
d96f4bf628 fix: move average calculation to interview controller 2022-01-29 20:27:15 +05:30
Rucha Mahabal
69eb3a0ac9 fix: interview ratings on job applicant dashboard 2022-01-29 20:05:07 +05:30
Rucha Mahabal
5d85c5a660 fix: designation mapping from job applicant to job offer 
- group create buttons
 2022-01-29 20:04:40 +05:30
Deepesh Garg
92416d80e6
Merge branch 'develop' into overseas_gst_tax 2022-01-29 18:48:23 +05:30
Saqib Ansari
b8802a3315 fix: patch order 2022-01-29 18:31:55 +05:30
Deepesh Garg
eba06212e8
Merge pull request #29350 from deepeshgarg007/asset_split 
feat: Splitting group assets
 2022-01-29 16:12:04 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Ankush Menat
43bd88e741 fix: work order serial no allows storing whitespace 2022-01-29 14:01:21 +05:30
Ankush Menat
e177c5277f fix: extend sr_no cleanup to packed items too 2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
Ankush Menat
14e3e163ae fix: ignore alternate item while checking pending qty 2022-01-29 13:59:25 +05:30
Deepesh Garg
2bf405d44c fix:Add shipping charges to taxes only if applicable 
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
 2022-01-29 07:27:21 +00:00
Deepesh Garg
4d87465698
Merge branch 'develop' into asset_split 2022-01-29 12:54:44 +05:30
Saqib Ansari
273fbe792c
Merge branch 'develop' into fix-ignore-pricing-rule 2022-01-29 12:44:19 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix 
fix: qty filter not working if apply_multiple_pricing_rules is enabled
 2022-01-29 12:43:41 +05:30
Saqib Ansari
4c8408a572
Merge branch 'develop' into fix-dn-mapping 2022-01-29 12:42:19 +05:30
Saqib Ansari
8a66a7ad46
Merge branch 'develop' into fix-ignore-pricing-rule 2022-01-29 12:42:00 +05:30
Saqib Ansari
04a28df170 fix: remove invalid patch 2022-01-29 12:40:25 +05:30
Deepesh Garg
5090959dc1 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split 2022-01-29 12:12:52 +05:30
marination
2f4d266ee1 refactor: Price fetching and updation logic 
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table
 2022-01-28 19:03:40 +05:30
Saqib Ansari
a1f3dc4e9e chore: remove unnecessary imports 2022-01-28 16:58:13 +05:30
Deepesh Garg
e45c38337c fix(India) Tax calculation for overseas suppliers 2022-01-28 16:10:30 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing 2022-01-28 14:34:29 +05:30
Ankush Menat
28994c0e76 test: delete data after running test 2022-01-28 13:50:57 +05:30
marination
2c14ab0439 chore: Break updation logic into smaller functions 
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls
 2022-01-28 13:25:55 +05:30
Ankush Menat
e4c220053f fix(patch): update BOMs to have correct transfer_material_against 2022-01-28 13:22:47 +05:30
Ankush Menat
86efa0dbfd fix: ensure correct-ish transfer against 2022-01-28 13:22:47 +05:30
Saqib Ansari
02af32dde6 fix: incorrect patch path 2022-01-28 10:17:16 +05:30
Saqib
139d5e17a9 fix: do not get password if client_secret is not set (#28547) 2022-01-27 20:24:05 +05:30
Saqib
c98887d39d fix(e-invoicing): totals validation of e-invoices (#28418) 2022-01-27 20:23:46 +05:30
mergify[bot]
0dafa8a12a
fix: stock ledger rendering glitch 
undefined Issue

(cherry picked from commit f38004219518e901eb736780b181c19fe88ce823)

Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
 2022-01-27 20:23:24 +05:30
Saqib
eb057b6bfe fix(e-invoicing): link to error log list 2022-01-27 20:19:56 +05:30
Saqib
0b626816d0 feat(e-invoicing): dispatch address (#28084) 2022-01-27 20:19:37 +05:30
Saqib
b262f48553 fix: 'NoneType' has no attribute 'name' (#27375) 2022-01-27 20:19:22 +05:30
Saqib Ansari
1076e96b87 Revert "refactor!: remove e_invoice utils (#27167)" 
This reverts commit 8ed6338336.
 2022-01-27 20:10:18 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code (#29479) 2022-01-27 20:08:05 +05:30
rohitwaghchaure
b75b00fefc
feat: provision to exclude exploded items in the BOM (#29450) 2022-01-27 12:44:01 +05:30
Suraj Shetty
0cb965f223
Merge pull request #29471 from frappe/fix-sorting 2022-01-27 11:15:57 +05:30
Suraj Shetty
29c7947db0 fix: Further sort sales_order_analysis to get consistent response 
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.
 2022-01-27 11:11:37 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user (#29317) 2022-01-27 00:51:29 +05:30
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration (#28940) 
Also remove duplicates :')
 2022-01-26 12:40:21 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor 
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
 2022-01-26 01:10:24 +05:30
Ankush Menat
f5f3552abb test: cover more reports in test 2022-01-25 23:22:14 +05:30
Deepesh Garg
c68c70f8bc feat: Refund entry against loans 2022-01-25 19:59:33 +05:30
marination
f8a5786542 chore: SQL to QB & accomodate Update Items 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM
 2022-01-25 19:51:47 +05:30
marination
3f48fc1898 fix: Incorrect packing list for recurring items & code cleanup 
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes
 2022-01-25 18:38:41 +05:30
Saqib Ansari
0b9a850a17
chore: add comment 2022-01-25 17:28:28 +05:30
Saqib Ansari
a73ad6759d fix(sales order): incorrect no. of items fetched while creating dn 2022-01-25 17:12:41 +05:30
Deepesh Garg
c6a17d1966
Merge pull request #29434 from frappe/mergify/bp/develop/pr-29404 
fix: Previous document currency getting overridden (backport #29404)
 2022-01-25 15:50:06 +05:30
Marica
a707d3705c
Merge pull request #29426 from marination/mr-safeguard 
fix: Use get for conditionally available fields while setting missing values
 2022-01-25 12:51:40 +05:30
mergify[bot]
f469ec87d9
fix: broken patches (backport #29067) (#29406) 
* chore: patch fixes

(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)

# Conflicts:
#	erpnext/patches/v13_0/make_homepage_products_website_items.py

* fix: remove desktop icons while deleting sales reports

(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)

* refactor: dont ignore dangerous exceptions in patches

(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)

* fix: make patch kinda idempotent

with previous query rerunning would've caused all values to become 0.

* chore: conflicts

* fix: check type before patching

Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-25 11:14:08 +05:30
Ankush Menat
b8fbfed096
fix: fetch "transfer material against" from BOM (#29435) 2022-01-24 21:45:51 +05:30
Deepesh Garg
b72cdb4bca fix: Previous document currency getting overriden 
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
 2022-01-24 15:19:54 +00:00
Rucha Mahabal
a1f0cb4ed1
fix: honour 'include holidays' setting while marking attendance for leave application (#29425) 2022-01-24 19:05:24 +05:30
Ankush Menat
3d3f0139fd
test: clear singles cache for changed settings (#29430) 2022-01-24 18:44:08 +05:30
marination
78b6b29a57 fix: Use get for conditionally available fields while setting missing values 
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
 2022-01-24 13:39:10 +05:30
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report 
test: unit test for deferred item with zero months
 2022-01-24 12:41:37 +05:30
Deepesh Garg
34be90b396
Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice 
fix: opening invoice creation tool can fetch multiple accounting dimension
 2022-01-24 12:36:20 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry 
fix: incorrect raw materials quantity in manufacture stock entry
 2022-01-24 12:13:54 +05:30
Rohit Waghchaure
f8d232ac26 fix: incorrect raw materials quantity in manufacture stock entry 2022-01-24 11:35:06 +05:30
rohitwaghchaure
a3ec78991f
Merge pull request #29353 from anupamvs/crm-contact-duplication-develop 
fix: contact duplication on converting lead to customer
 2022-01-24 10:16:49 +05:30
ruthra
f122a47d0d refactor: fix failing test cases 2022-01-24 10:08:25 +05:30
ruthra
80ea163953 fix: linter issue 2022-01-23 21:49:02 +05:30
mergify[bot]
8e3cd1ab31
fix: Don't delete barcode while saving Item (#29411) (#29417) 
(cherry picked from commit 096e7b9ec5e3b67983cfa3a06335fba435f88c97)

Co-authored-by: Britlog <info@britlog.com>
 2022-01-23 17:04:55 +05:30
ruthra
88463dc494 test: validating custom accouting dimension in opening invoice tool 
- create new dimension 'department'
 - assign and validate department in opening invoices
 2022-01-21 19:33:06 +05:30
ruthra
e2267cdba8 fix: opening invoice creation tool not taking in accouting dimension 2022-01-21 19:21:26 +05:30
Saqib Ansari
0a24953906
Merge pull request #29367 from nextchamp-saqib/fix-credit-balance-report 
fix: bypass_credit_limit_check in credit balance report
 2022-01-21 16:36:48 +05:30
Ankush Menat
dc8dad4456 fix(patch): skip patch if column doesn't exist 2022-01-21 16:12:13 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase 2022-01-21 15:33:13 +05:30
Ankush Menat
4fa93e246e test: create and cancel sr no with stock reco 2022-01-21 15:27:10 +05:30
Ankush Menat
203f0086f8 fix(patch): update stock reconciliation current serial nos 
When current serial nos are non-existing there shouldn't be any value in
current_serial_no field.
 2022-01-21 15:27:10 +05:30
Ankush Menat
33c4a0b5a9 fix: bad default for non-existing serial nos 
serial_no field should have empty string if it doesn't have any serial
nos
 2022-01-21 15:27:10 +05:30
Ankush Menat
ea5efd0791 perf: single query to update serial nos 2022-01-21 15:27:10 +05:30
Noah Jacob
11c9a5a79f
fix: update status on visit cancel (#29389) 
* fix: update status on cancelling visit

* test: updated test for cancelling visits
 2022-01-21 14:48:33 +05:30
Saqib Ansari
c7e75f9551
Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix 
fix: first depreciation amount in asset
 2022-01-21 14:25:43 +05:30
Saqib Ansari
eff1d6bf67
Merge branch 'develop' into grouped-asset-purchase 2022-01-21 14:20:47 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase 2022-01-21 14:20:27 +05:30
Deepesh Garg
0d3b279fe6
Merge pull request #29362 from nextchamp-saqib/fix-cancel-jv 
fix: cannot cancel jv after migrating from v12
 2022-01-21 14:20:25 +05:30
Himanshu
f5ed0c83b7
fix(Timesheets): calculate to time (#28589) 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2022-01-21 13:05:47 +05:30
Saqib Ansari
c3e890e59f
Merge branch 'develop' into fix-cancel-jv 2022-01-21 12:25:30 +05:30
Saqib Ansari
53addfda15 fix: sider issue 2022-01-21 12:23:52 +05:30
Saqib Ansari
0666996e4e
Merge pull request #29373 from nextchamp-saqib/validate-asset-cc 
fix: cost center validation of asset
 2022-01-21 12:21:49 +05:30
Saqib Ansari
ae580d116c fix: failing test cases 2022-01-21 12:19:53 +05:30
Noah Jacob
20216fa9f1
fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607) 
* fix: updated packed_items getting fetched on sales return

* fix: updated test cases for product bundle returns

* fix: moved calculate_mapped_packed_items_return to stock.utils

* fix: updated packed_items getting fetched on Return/Credit Note

* refactor: change var name to avoid `self`

* fix: check item code before assigning parent item

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-21 11:50:13 +05:30
Saqib Ansari
0bbde4819b fix: depreciation amount on selling an asset 2022-01-21 11:44:05 +05:30
Saqib Ansari
60bfead773 fix: first depreciation amount in asset 2022-01-21 11:32:55 +05:30
Ankush Menat
cce35c1536
fix(patch): delete hospitality custom fields (#29382) 2022-01-20 19:42:08 +05:30
Anupam Kumar
ebb9d8d45b
Merge branch 'develop' into crm-contact-duplication-develop 2022-01-20 17:30:14 +05:30