mergify[bot] bfd240a19d

fix: avoid name clash in delivery stop (backport #37306) (#37702) ...

fix: avoid name clash in delivery stop (#37306)

* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder

(cherry picked from commit 681782121cd0d723f725e4c1c4c30167eb1622ec)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>

2023-10-26 18:13:23 +05:30

..

accounts

fix: Correctly extract last message (#37602)

2023-10-20 17:28:55 +05:30

assets

fix: don't set finance books if gross_purchase_amount is not set (#37480)

2023-10-12 19:41:11 +05:30

bulk_transaction

…

buying

refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)

2023-10-25 14:58:01 +05:30

change_log

…

commands

…

communication

…

config

…

controllers

fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37627)

2023-10-23 12:27:16 +05:30

crm

Merge branch 'develop' of https://github.com/frappe/erpnext into lead_details_qb

2023-10-09 19:23:16 +05:30

domains

…

erpnext_integrations

refactor: remove test test_default_bank_account

2023-09-26 15:10:20 +05:30

maintenance

fix: set Phone and Email option in doctypes (#35549)

2023-06-11 19:34:41 +05:30

manufacturing

refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)

2023-10-25 14:58:01 +05:30

patches

fix: avoid name clash in delivery stop (backport #37306) (#37702)

2023-10-26 18:13:23 +05:30

portal

refactor!: drop ecommerce in favor of webshop (#33265)

2023-10-17 17:05:44 +05:30

projects

fix(test): project test case

2023-10-17 12:48:07 +05:30

public

chore: new erpnext logo as per espresso

2023-10-20 12:25:04 +00:00

quality_management

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

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

regional

Merge pull request #36797 from rtdany10/uae-item-tax

2023-10-15 18:17:40 +05:30

selling

refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)

2023-10-25 14:58:01 +05:30

setup

refactor!: drop ecommerce in favor of webshop (#33265)

2023-10-17 17:05:44 +05:30

shopping_cart

…

startup

fix: Button to clear demo data

2023-07-29 22:39:07 +05:30

stock

fix: avoid name clash in delivery stop (backport #37306) (#37702)

2023-10-26 18:13:23 +05:30

subcontracting

feat: allow return of components for SCO that don't have SCR created (backport #37686) (#37693)

2023-10-26 11:56:27 +05:30

support

refactor!: Lower all perm to Desk User

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

telephony

…

templates

chore: remove debugger (#37584)

2023-10-19 12:35:36 +05:30

tests

fix: fix CI

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

translations

fix: german tranlations of "Is Return"

2023-10-09 23:45:58 +02:00

utilities

refactor!: drop ecommerce in favor of webshop (#33265)

2023-10-17 17:05:44 +05:30

www

refactor!: drop ecommerce in favor of webshop (#33265)

2023-10-17 17:05:44 +05:30

__init__.py

chore: v15 release

2023-10-19 16:04:06 +05:30

.stylelintrc

…

exceptions.py

…

hooks.py

Merge branch 'develop' of https://github.com/frappe/erpnext into sales_order_item_dimensions

2023-10-17 18:30:49 +05:30

modules.txt

refactor!: drop ecommerce in favor of webshop (#33265)

2023-10-17 17:05:44 +05:30

patches.txt

fix: avoid name clash in delivery stop (backport #37306) (#37702)

2023-10-26 18:13:23 +05:30