| commit | c1f47d36cf0a3d3e7e617beb64221e0dd52c9088 | [log] [tgz] |
|---|---|---|
| author | Frappe PR Bot <developers@frappe.io> | Tue May 10 10:27:19 2022 +0000 |
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | Sun May 15 15:04:18 2022 +0000 |
| tree | 6705890659e61efc2801d97dd5c382d8f24571ed | |
| parent | b3964ee35bf8729a26944a4898aa0e38cfec0133 [diff] |
chore(release): Bumped to Version 13.29.0 # [13.29.0](https://github.com/frappe/erpnext/compare/v13.28.0...v13.29.0) (2022-05-10) ### Bug Fixes * Consider paryt and party type as well in group by consolidated view ([189fc89](https://github.com/frappe/erpnext/commit/189fc89e2d5cc0f9108ea35b44eb8535bbf40475)) * disable form save on naming series tool ([#30909](https://github.com/frappe/erpnext/issues/30909)) ([#30910](https://github.com/frappe/erpnext/issues/30910)) ([d60a6cb](https://github.com/frappe/erpnext/commit/d60a6cb2f83c7972875a2dd201a1ab2d9b5a5bbc)) * double future qty updates ([0db3013](https://github.com/frappe/erpnext/commit/0db3013c9b078120f21e3a8c568b5395fc4ea4fd)) * HSN-wise-summary of outward supplies Updated Report ([3637525](https://github.com/frappe/erpnext/commit/363752510ead7d3b86693d3659b2157753f2762d)) * Ignore loan repayments made from salary slip ([b7e1d40](https://github.com/frappe/erpnext/commit/b7e1d40e43c136f0e967111e10af95ddc80e2fd5)) * **india:** invoice type for a debit note e-invoice ([#30948](https://github.com/frappe/erpnext/issues/30948)) ([c46add3](https://github.com/frappe/erpnext/commit/c46add3760f23b3563a5fcba79287d0f6ec77e23)) * **india:** keyerror while generating e-way bill from an e-invoice ([#30879](https://github.com/frappe/erpnext/issues/30879)) ([98d799e](https://github.com/frappe/erpnext/commit/98d799e7cc2c3571683164e56d587ba595c8966c)) * **india:** re-arrange e-way bill dialog fields ([#30941](https://github.com/frappe/erpnext/issues/30941)) ([7ce5c93](https://github.com/frappe/erpnext/commit/7ce5c93f44bae640f92d97955963e3ba01a579ef)) * Item Alternative Test ([964de1f](https://github.com/frappe/erpnext/commit/964de1fc69b32d377f8c2a6f15d6ab7381669606)) * patch for renaming membership settings ([#30929](https://github.com/frappe/erpnext/issues/30929)) ([9189653](https://github.com/frappe/erpnext/commit/9189653f2ea94bd21e5227608645aba34c78e34d)) * **pos:** creating pos returns resets pricing rules & discounts ([#30936](https://github.com/frappe/erpnext/issues/30936)) ([a0e39db](https://github.com/frappe/erpnext/commit/a0e39db200fd89112953d4d8a3bd9d0dd2b36374)) * remove check for already allocated earned leaves ([#30931](https://github.com/frappe/erpnext/issues/30931)) ([#30932](https://github.com/frappe/erpnext/issues/30932)) ([80f7d66](https://github.com/frappe/erpnext/commit/80f7d66255aa5b3e07fd8e667b17d4cabd3703d5)) * Remove commit from stock entry test. The assertion is not important ([c449b35](https://github.com/frappe/erpnext/commit/c449b35cc11615fc7d9e616c2038b9e90c3957d6)) * Set available-for-use date if missing ([#30838](https://github.com/frappe/erpnext/issues/30838)) ([bf2eaec](https://github.com/frappe/erpnext/commit/bf2eaecb1d8cec3676162868422ac96a7cc958cc)) * show group warehouse in Sales Order ([#30891](https://github.com/frappe/erpnext/issues/30891)) ([#30893](https://github.com/frappe/erpnext/issues/30893)) ([c458e14](https://github.com/frappe/erpnext/commit/c458e14e680abedf1b4b9ee4f68a28af802c60e2)) * Show linked time sheets in sales invoice dashboard ([4f4af52](https://github.com/frappe/erpnext/commit/4f4af523e0d5c9e947d94ce13dc416d16941cfe6)) * sort before picking next stock reco ([e27fb58](https://github.com/frappe/erpnext/commit/e27fb58130f3300054c3d77c2c943d3c1304d19d)) * subtract change_amount from paid_amount field on POS Register ([#30937](https://github.com/frappe/erpnext/issues/30937)) ([b7e873b](https://github.com/frappe/erpnext/commit/b7e873b55d201e3cb1894a1159de1912a7106012)) * Unlink and delete batch created from stock reco on cancel ([fc35323](https://github.com/frappe/erpnext/commit/fc353231065f1c33890d5b7e55c2e4e2506d986d)) * Wrap SLE actual_qty in `flt` to avoid NoneType operation ([d53228b](https://github.com/frappe/erpnext/commit/d53228b153437f9dedcb1229bf579411f3122729)) ### Features * **HR:** Leave Type configuration to allow over allocation (backport [#30940](https://github.com/frappe/erpnext/issues/30940)) ([#30944](https://github.com/frappe/erpnext/issues/30944)) ([64440fc](https://github.com/frappe/erpnext/commit/64440fc4fbc55068906af7466aa5b4d5333b9d12)) * **india:** cancel e-way bill is enabled with e-invoicing APIs. ([#30924](https://github.com/frappe/erpnext/issues/30924)) ([4ef2ffd](https://github.com/frappe/erpnext/commit/4ef2ffd14c7546d6c5670b950df5eda4b458b200)) * **india:** generate qrcode button for e-invoice ([#30946](https://github.com/frappe/erpnext/issues/30946)) ([7bd5b2b](https://github.com/frappe/erpnext/commit/7bd5b2ba29783bc00b922905ada6a9eb06fde36e)) * **india:** store e-way bill auto calculated distance in sales invoice ([#30923](https://github.com/frappe/erpnext/issues/30923)) ([b96f156](https://github.com/frappe/erpnext/commit/b96f1565c53a47ef5680cb98f5aa3f02a1d0246e)) (cherry picked from commit 7369db59aacfeecac086930f2a6b373973db7a0c) # Conflicts: # erpnext/__init__.py
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index e72e11a..85db714 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -8,11 +8,15 @@ from erpnext.hooks import regional_overrides <<<<<<< HEAD +<<<<<<< HEAD __version__ = "13.27.1" >>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1) ======= __version__ = "13.28.0" >>>>>>> 8cc2ea0ddb (chore(release): Bumped to Version 13.28.0) +======= +__version__ = "13.29.0" +>>>>>>> 7369db59aa (chore(release): Bumped to Version 13.29.0) def get_default_company(user=None):