Sagar Vora
85c4c342d8
fix: improve patches
2022-06-26 18:30:54 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Smit Vora
64de0d06ad
patch: remove custom field creation patch
2022-06-26 11:56:06 +05:30
Nabin Hait
f72d5506de
fix: get_all replace by sql
2022-06-25 15:08:45 +05:30
Nabin Hait
d8163f3e47
fix: set exchange rate
2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e
fix: merge conflicts and sider issues
2022-06-25 11:40:23 +05:30
Smit Vora
8fb0997cf1
patch: remove related docs and warn
2022-06-24 21:59:28 +05:30
Smit Vora
3c9eea54a5
fix: remove student naming series
2022-06-24 13:42:07 +05:30
Sagar Vora
2e6919b7be
fix: remove more India patches
2022-06-24 14:14:12 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
ruthra kumar
5826b7b071
fix: identify empty values "" in against_voucher columns
2022-06-21 19:50:50 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Sagar Vora
33b54c50ea
chore: remove ITC patch
2022-06-19 23:18:04 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
s-aga-r
5002f1f1e5
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
2022-06-17 16:47:41 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt ( #31371 )
...
* chore: delete orphaned patches
* test: orphan/missing entries in patches.txt
[skip ci]
2022-06-16 22:15:06 +05:30
Ankush Menat
276267d5a6
fix: remove agriculture module from patch ( #31369 )
2022-06-15 15:26:05 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting
2022-06-13 03:00:53 -07:00
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
...
refactor: migrating data from GL to payment ledger using raw SQL
2022-06-10 17:15:58 +05:30
ruthra kumar
e2c52436da
refactor: migrate gl to payment ledger using sql
2022-06-10 13:17:43 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state ( #31243 )
2022-06-06 16:27:25 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-02 17:30:34 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch ( #31097 )
2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-01 12:15:42 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting
2022-05-25 12:32:33 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 ( #31118 )
2022-05-25 11:34:25 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
8e72f19bfb
feat: patch to migrate gl entries to payment ledger
2022-05-20 18:21:47 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
323bdf85ce
feat: SL and GL reposting
2022-05-20 10:45:34 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Rucha Mahabal
7d4872aedd
patch: set payroll entry status
2022-05-19 20:35:56 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors ( #30979 )
...
recoverable erros:
1. timeout
2. lock/deadlocks
2022-05-16 11:23:35 +05:30
Deepesh Garg
b13698a1d5
fix: Failing accounting dimension patch
...
(cherry picked from commit b14a7b8a5db2512f365efb75b9cc75ee3c3fa213)
2022-05-12 09:27:40 +00:00
Sagar Sharma
1a70701eca
fix: per_billed for return DN ( #30868 )
...
* fix: per_billed for return DN
* chore: move patch from v14 to v13
2022-05-11 16:49:28 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field ( #30835 )
2022-05-02 13:58:22 +05:30
Ankush Menat
f0049da284
chore: correct link
2022-05-02 11:52:46 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Rushabh Mehta
be0f84a722
fix(minor): fix create_accounting_dimensions_in_orders.py
2022-05-02 09:41:12 +05:30
Deepesh Garg
fc09c90af7
Merge branch 'develop' into accounting_dimension_consistency
2022-05-01 22:02:10 +05:30
Rushabh Mehta
d746db5547
fix(minor): discount accounting patch
2022-05-01 12:25:21 +05:30
Deepesh Garg
f25251bb70
chore: Clean up patches
2022-04-29 12:42:29 +05:30
Deepesh Garg
3c578a3b0b
chore: Add patch to delete education doctypes
2022-04-28 19:54:28 +05:30
Deepesh Garg
60b693f84f
chore: clean up hooks
2022-04-28 12:02:54 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account
2022-04-25 12:17:50 +05:30
Rucha Mahabal
9d158088ee
chore: remove unused Employee Transfer Property doctype
2022-04-22 20:20:12 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account
2022-04-21 15:06:58 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com
2022-04-21 12:32:33 +05:30
marination
6d750e185e
fix: Handle Multiselect field mapping separately
...
- Map Multiselect child table to Website Item (copy rows)
2022-04-20 17:40:03 +05:30
marination
5660b335ba
fix: Mistyped variable name in patch
2022-04-20 12:25:59 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking ( #30737 )
2022-04-19 12:18:46 +05:30
marination
d0cd194398
chore: Patch to copy custom fields (field filters) from Item to Website Item
2022-04-18 21:40:19 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account
2022-04-14 17:29:28 +05:30
rahib-hassan
0eff74c650
fix: tabspacing
2022-04-14 15:42:16 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration ( #30584 )
...
The DATEV integration follows the trend and moves into a separate app.
- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
2022-04-13 09:24:19 +00:00
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account
2022-04-11 14:55:42 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-09 19:57:59 +05:30
rahib-hassan
dc2944a041
fix[minor]: removed doc assignment
2022-04-09 03:55:25 +05:30
rahib-hassan
ac16f3b71f
fix: lock timeout exceeded
2022-04-08 18:20:41 +05:30
rahib-hassan
ac7f1cbd87
fix: minor fix
2022-04-08 17:46:49 +05:30
rahib-hassan
35e875c111
fix(patch): enable discount account in buying and selling if exist in accounts settings
2022-04-08 17:27:53 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch ( #30594 )
2022-04-06 14:20:39 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-06 10:00:51 +05:30
Deepesh Garg
a7e125a540
chore: format patch file
2022-04-02 20:36:36 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Deepesh Garg
03952f8819
fix(India): Auto tax fetching based on GSTIN
...
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)
# Conflicts:
# erpnext/patches.txt
# erpnext/regional/india/setup.py
# erpnext/selling/doctype/quotation/quotation.json
2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Raffael Meyer
c01fe74cf0
fix(patch): fix failing patches ( #30427 )
...
* patch: reload Opportunity
* patch: reload child tables before doctype
2022-03-28 17:53:54 +05:30
Saqib Ansari
4766732b56
Merge branch 'develop' into fix-item-tax-template-patch
2022-03-26 11:48:41 +05:30
Rucha Mahabal
ffec9516fa
fix: do not update status to Paid if sanctioned amount is 0
2022-03-25 21:41:48 +05:30
Rucha Mahabal
0461223627
fix: Expense Claim conditions for Paid status
...
- status doesn't change to Paid if the entire required amount is already covered via linked advances
- status doesn't change to Paid if the claim is partially paid via advances
- patch to update such uncancelled claims to Paid
2022-03-25 21:41:48 +05:30
Saqib Ansari
936267c934
fix: move item tax to item tax template patch
2022-03-25 15:45:13 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
...
fix: multiple pos issues
2022-03-25 15:34:54 +05:30
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches ( #30409 )
...
* fix: failing broken patches
* refactor: simpler conditions
[skip ci]
2022-03-25 12:49:37 +05:30
Saqib Ansari
16253a2f72
fix: set is_return & return_against in POS Invoice Reference table
2022-03-25 10:51:30 +05:30
Deepesh Garg
972d06555a
fix: Add permission for KSA Vat documents
2022-03-18 17:32:46 +05:30
Rucha Mahabal
f090e63e54
test: fix holiday list creation causing flaky tests ( #30260 )
2022-03-17 15:21:56 +05:30
Sagar Vora
ceccacac1f
fix: restore inadvertently deleted patches
2022-03-17 13:43:13 +05:30
Rucha Mahabal
3218ccbb96
fix: Leave Policy Assignment creation patch ( #30215 )
2022-03-15 11:43:27 +05:30
Ankush Menat
d3e90ed8c8
fix(patch): remove dead links to ProdPlan Item
2022-03-14 14:15:43 +05:30
Deepesh Garg
60ba0ba219
Merge branch 'develop' into loan_cost_center
2022-03-13 12:50:27 +05:30
Deepesh Garg
5d66cc4c4a
fix: Add cost center in loan document
2022-03-10 12:22:37 +05:30
Saqib Ansari
4d8798b0ea
fix: ignore non-unique swift numbers while migrating ( #30132 )
2022-03-09 16:41:54 +05:30
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +05:30
Rucha Mahabal
650099ee65
Merge branch 'develop' into emp-adv-status
2022-03-01 20:30:58 +05:30
Sagar Vora
b90a134d91
fix: remove patches
2022-02-25 11:36:18 +05:30
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +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
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Ankush Menat
312db429e4
refactor: use qb for patching flag
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
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
a0bdcbd0cd
fix: Add patch for account fields
2022-02-21 11:44:00 +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
1617e0d0e6
fix: Remove reload doc
2022-02-17 22:52:53 +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
ChillarAnand
358734dcea
fix: Skip deletion if linked docs exists
2022-02-17 16:31:27 +05:30
ChillarAnand
fb59247182
fix: Delete party type records in patch
2022-02-17 15:15:44 +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
marination
06d36c6143
chore: Move patch that updates SO from WO to v13
2022-02-16 17:40:16 +05:30
marination
0ca58d7627
chore: Patch to update SO work_order_qty and Linter fix
2022-02-15 14:28:00 +05:30
Sagar Sharma
19a6c21eec
refactor!: amazon mws integration ( #29438 )
...
* remove: amazon mws integration
* add patch to remove doctype
* remove old patch
2022-02-14 19:43:26 +05:30
Deepesh Garg
615dd9decd
fix: Patch fixes
2022-02-13 19:24:10 +05:30
Ankush Menat
89959976bd
fix: patch existing bins
2022-02-09 12:21:05 +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
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
ChillarAnand
899ca8b384
refactor: Code cleanup
2022-02-03 15:24:45 +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
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
Nabin Hait
364856b7c5
fix: patch for migrating cost center allocations
2022-02-01 22:26:03 +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
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
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
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
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
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
ce49e6ccf7
fix: Resolved conflicts in patches
2022-01-31 13:25:44 +05:30
Nabin Hait
d71d3e3b3e
fix: Minor issues in existing patches
2022-01-31 13:24:18 +05:30
Ankush Menat
157b4b33fe
refactor!: dynamically compute bom_level
2022-01-30 22:06:24 +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
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing
2022-01-28 14:34:29 +05:30
Ankush Menat
e4c220053f
fix(patch): update BOMs to have correct transfer_material_against
2022-01-28 13:22:47 +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
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
Deepesh Garg
c68c70f8bc
feat: Refund entry against loans
2022-01-25 19:59:33 +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
ChillarAnand
7086d3f3d7
Merge branch 'develop' into remove-nonprofit
2022-01-24 11:35:47 +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
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
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
Saqib Ansari
c3e890e59f
Merge branch 'develop' into fix-cancel-jv
2022-01-21 12:25:30 +05:30
Ankush Menat
cce35c1536
fix(patch): delete hospitality custom fields ( #29382 )
2022-01-20 19:42:08 +05:30
Chillar Anand
2718ddd784
refactor: Removed hospitality domain from ERPNext ( #29167 )
2022-01-20 11:57:22 +05:30
Saqib Ansari
04d64567ef
fix: cannot cancel jv after migrating from v12
2022-01-19 19:37:55 +05:30
Saqib Ansari
d36092d448
patch: set default asset quantity as 1
2022-01-19 18:27:19 +05:30
Marica
b9f70edacb
Merge pull request #28843 from noahjacob/maint_sch_link_fix
...
refactor: update_serial_no function for old Maintenance Visits
2022-01-19 12:49:11 +05:30
Rucha Mahabal
bf30932de0
patch: Employee Advance return statuses
2022-01-18 14:36:38 +05:30
Rucha Mahabal
b07c1f3bf1
feat: add link to leave application in leave notification ( #29316 )
2022-01-17 14:37:25 +05:30
Noah Jacob
d39ffeeef0
Merge branch 'develop' into maint_sch_link_fix
2022-01-17 10:34:07 +05:30
Ankush Menat
66bf21f143
fix(patch): sle.serial_no = "\n" causes incorrect queue ( #29306 )
...
This happens due to old data.
2022-01-16 20:45:59 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields ( #29287 )
2022-01-14 14:59:58 +05:30
Chillar Anand
39eb4e040c
fix(healthcare): Remove custom fields related to healthcare ( #29129 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-01-14 12:37:32 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix
2022-01-12 19:46:52 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Ankush Menat
f8119563ca
fix(patch): enable all uoms on recently created sites
2022-01-11 17:49:30 +05:30
Deepesh Garg
93d784dde3
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f
fix: test cases
2022-01-10 21:28:29 +05:30
Deepesh Garg
3fdd47e71f
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421
fix: Cleanup and fixes
2022-01-10 17:31:38 +05:30
Ankush Menat
cbaa8fdade
refactor: convert query to ORM
2022-01-10 16:13:52 +05:30
Ankush Menat
0faa116f97
fix(patch): serial no whitespace trimming
...
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
2022-01-10 16:02:27 +05:30
Shadrak Gurupnor
25c875e447
chore: remove framework patch for custom fields ( #29117 )
...
* chore: patches were breaking during migration
* fix: rewrote the query in query builder
* chore: removed patch from patches.txt
2022-01-07 18:54:50 +05:30
ChillarAnand
0c0a9ed96d
refactor: Remove non-profit domain from ERPNext
2022-01-06 09:53:49 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext ( #29022 )
2022-01-04 17:26:11 +05:30
Rohit Waghchaure
d9b9f4e8b7
fix: optimize patch for update bom in SO and MR
2021-12-29 10:14:03 +05:30
Rucha Mahabal
8226ea65c8
fix: linter issues
2021-12-28 08:54:05 +05:30
Rucha Mahabal
3c8ed4f737
Merge branch 'develop' into multiple-cost-centers-against-employee
2021-12-28 08:40:48 +05:30
Deepesh Garg
3b9bea7937
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-28935
2021-12-26 10:25:52 +05:30
Raffael Meyer
52397c9771
fix: avoid "string" in None
condition
2021-12-26 02:15:57 +01:00
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings ( #29019 )
2021-12-24 17:20:23 +05:30
Nabin Hait
f152a40b28
feat: Provision to assign multiple payroll cost centers against a single employee
2021-12-24 16:23:33 +05:30
Deepesh Garg
12a65eef8a
fix: Is Reverse Charge check in Tax Category
...
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)
# Conflicts:
# erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Saqib Ansari
564d23fa8d
fix(ksa): enable ksa pos invoice print format
2021-12-16 11:19:03 +05:30
Noah Jacob
af2e95d192
Merge branch 'develop' into maint_sch_link_fix
2021-12-15 15:42:23 +05:30
Noah Jacob
c872aa43f8
fix(patch): updates maintenance schedule field for old docs
2021-12-15 15:27:41 +05:30
Deepesh Garg
6749d8e6c9
Merge pull request #28832 from deepeshgarg007/ksa_e_invoice_patch_fix
...
fix: KSA QR field rename patch
2021-12-14 12:47:58 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla
...
refactor(SLA): Application of SLA and its fields
2021-12-13 10:29:56 +05:30
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview
2021-12-12 22:13:11 +05:30
Deepesh Garg
14d03a9446
fix: KSA QR field rename patch
2021-12-12 12:55:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method
2021-12-08 07:53:45 +05:30
Dany Robert
15373f1b2d
fix: intendation error
2021-12-07 18:34:34 +05:30
Dany Robert
a0aeacee8e
fix: reload doc
2021-12-07 12:39:39 +00:00
Dany Robert
2256155e80
feat(Regional): patch to disable ksa print formats for other countries
2021-12-07 11:02:28 +00:00
Rucha Mahabal
4686527928
Merge branch 'develop' into exit-interview
2021-12-07 16:23:31 +05:30