mergify[bot] f4f40cc776

feat: composite WIP asset (copy #37352) (#37353) ...

* feat: wip composite asset

(cherry picked from commit 4907e7acd4ff549f34f6c9d0144af83db0ad9cc1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>

2023-10-04 10:29:18 +05:30

..

accounts

feat: composite WIP asset (copy #37352) (#37353)

2023-10-04 10:29:18 +05:30

assets

feat: composite WIP asset (copy #37352) (#37353)

2023-10-04 10:29:18 +05:30

bulk_transaction

…

buying

fix: currency symbol in the Supplier Quotation Comparison report (backport #37337) (#37342)

2023-10-03 20:32:34 +05:30

change_log

…

commands

…

communication

…

config

…

controllers

fix: Use default Cost Center of the Company for additional discount (#37234)

2023-09-27 10:38:32 +05:30

crm

refactor!: remove social media post module

2023-09-14 12:11:23 +05:30

domains

…

e_commerce

fix: allow to select parent warehouse in the website item (#37047)

2023-09-20 17:27:35 +05:30

erpnext_integrations

refactor!: remove woocommerce

2023-09-13 11:50:04 +05:30

maintenance

…

manufacturing

chore: fix linter issue (backport #37349) (#37350)

2023-10-03 22:11:10 +05:30

patches

feat: Add a process document for Subscription (#37126)

2023-09-19 18:39:44 +05:30

portal

…

projects

fix: Not unique table/alias: 'tabTask' (#37285)

2023-09-29 15:05:02 +05:30

public

fix: trial balance report freezes when adding filters (#37264)

2023-09-27 12:34:40 +05:30

quality_management

Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype

2023-08-30 16:46:00 +05:30

regional

refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it

2023-09-06 17:41:27 +02:00

selling

Merge pull request #37268 from GursheenK/ar-summary-party-filter

2023-09-28 11:54:34 +05:30

setup

chore: Add missing comma

2023-09-26 14:20:41 +05:30

shopping_cart

…

startup

…

stock

feat: composite WIP asset (copy #37352) (#37353)

2023-10-04 10:29:18 +05:30

subcontracting

fix(ux): move get_route_options_for_new_doc to refresh (#37096)

2023-09-16 15:59:09 +05:30

support

refactor!: Lower all perm to Desk User

2023-08-28 22:42:14 +05:30

telephony

…

templates

fix: allow to select parent warehouse in the website item (#37047)

2023-09-20 17:27:35 +05:30

tests

fix: fix CI

2023-09-13 17:18:13 +02:00

translations

Merge pull request #37191 from FHenry/dev_fr_translation

2023-09-25 18:24:16 +05:30

utilities

fix: allow to select parent warehouse in the website item (#37047)

2023-09-20 17:27:35 +05:30

www

…

__init__.py

…

.stylelintrc

…

exceptions.py

…

hooks.py

feat: Add a process document for Subscription (#37126)

2023-09-19 18:39:44 +05:30

modules.txt

…

patches.txt

feat: Add a process document for Subscription (#37126)

2023-09-19 18:39:44 +05:30