Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
Deepesh Garg
0e3438db10
Merge branch 'develop' of https://github.com/frappe/erpnext into move_taxjar_integration_new
2022-11-23 17:47:22 +05:30
Deepesh Garg
f448a077b8
chore: Cleanup patches
2022-11-23 17:47:05 +05:30
niralisatapara
46e8cdf31a
feat: item wise tds calculation for purchase order.
2022-11-22 14:15:36 +05:30
Deepesh Garg
81c856ccb8
chore: Remove unwanted patch
2022-11-21 21:00:31 +05:30
Deepesh Garg
1100816d7a
refactor!: Move TaxJar integration from ERPNext
2022-11-21 20:18:06 +05:30
Raffael Meyer
491857b3c8
fix: remove obsolete comment
2022-11-18 10:57:52 +01:00
barredterra
d2563ee973
feat: create incoterms and migrate shipments
2022-11-17 22:16:43 +01:00
Ritwik Puri
b03b568e6c
chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch ( #32994 )
...
[skip ci]
2022-11-17 11:59:42 +05:30
Deepesh Garg
f6a61b999f
chore: fix patch
2022-11-04 08:11:38 +05:30
Deepesh Garg
153675e52a
chore: Update patch
2022-11-04 01:03:45 +05:30
Deepesh Garg
b9d497c61c
chore: Update patch
2022-10-28 20:18:55 +05:30
Deepesh Garg
fb41bdd700
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice
2022-10-28 17:18:11 +05:30
niralisatapara
397e3b1ade
feat: item wise tds calculation
...
item wise tds calculation
2022-10-25 15:09:59 +05:30
niralisatapara
4a35a224e2
feat: Item Wise TDS Calculation
2022-10-19 15:34:41 +05:30
niralisatapara
21d09c5bf2
Item Wise TDS Calculation
2022-10-19 14:33:02 +05:30
Deepesh Garg
4b828dd276
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
2022-10-08 18:41:39 +05:30
Deepesh Garg
777ed10e21
Merge pull request #32491 from ruthra-kumar/performance_issue_on_migrate_remarks_patch
...
refactor: remove duplicate entries on remarks migration patch
2022-10-05 16:04:23 +05:30
ruthra kumar
518ab93e03
refactor: remove duplicate entries on remarks migration patch
2022-10-04 12:39:34 +05:30
Nabin Hait
fe891aa488
fix: Create accounting dimension fields in asset capitalization
2022-09-30 15:55:41 +05:30
Deepesh Garg
679b5ed551
chore: Add patch to update repayment schedule type in loan documents
2022-09-30 14:06:06 +05:30
Deepesh Garg
be623ce8e8
fix: Disbursement Account in patch to update old loans
2022-09-28 15:36:59 +05:30
Ankush Menat
97977cdb4b
fix: correct sql output format in CRM patch ( #32213 )
2022-09-14 19:19:05 +05:30
Deepesh Garg
51c37aeee3
Merge branch 'develop' into lead-notes-patch
2022-09-13 09:42:07 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries
2022-09-07 14:55:56 +05:30
Nabin Hait
4b13452022
fix: drop old notes column from lead and prospect
2022-09-05 18:28:09 +05:30
Nabin Hait
2a100abef1
perf: lesser SQL queries and no validation
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-09-05 18:16:34 +05:30
Nabin Hait
3abd00f3bb
fix: Migrate old lead notes as per the new format
2022-09-05 18:10:53 +05:30
Deepesh Garg
118b0c0f86
chore: fix message
2022-09-04 19:03:16 +05:30
HENRY Florian
b05fdb28ff
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-31 13:52:28 +02:00
Ankush Menat
ffa3071d36
fix: force delete old report docs ( #32026 )
2022-08-30 15:43:57 +05:30
Ankush Menat
2d41704424
fix(patch): update sla doctype directly ( #32014 )
...
fix: update sla doctype directly
2022-08-29 20:50:27 +05:30
ruthra kumar
3a6b095ed4
chore: patch for migrating remarks to payment ledger
2022-08-29 15:59:56 +05:30
Florian HENRY
d19b664ba9
chore: better text
2022-08-25 22:35:44 +02:00
Florian HENRY
ac66538651
chore: remove debug
2022-08-25 22:35:08 +02:00
Florian HENRY
9d02fbadb4
fix: upgrade process to version-14 when currency opportunity wass not set
2022-08-25 20:45:35 +02:00
Sagar Sharma
e888639c7e
fix: Subcontracting Receipt GL Entries
2022-08-22 10:48:21 +05:30
Sagar Sharma
8704ca783d
fix: Add dimension section in subcontracting doctypes ( #31849 )
2022-08-18 10:58:33 +05:30
Nabin Hait
909945c0ac
fix: map old data as per new options of no-of-employees
2022-08-09 20:47:18 +05:30
ruthra kumar
80f508c4b1
chore: patch for creating existing dimensions in asset repair
2022-08-05 15:22:38 +05:30
Suraj Shetty
45544c2b1e
Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app
2022-07-28 10:07:40 +05:30
Marica
d2d651a0c3
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-25 12:43:08 +05:30
Rucha Mahabal
7b0e5661c6
fix(patch): ignore links while deleting hr payroll doctypes ( #31674 )
2022-07-22 12:46:59 +05:30
Suraj Shetty
3593573ed2
Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app
2022-07-22 12:24:20 +05:30
Suraj Shetty
cf9c065cf8
refactor: Add exotel deprecation warning
2022-07-22 12:22:57 +05:30
Sagar Vora
bf2833b8ee
fix: ensure defaults removed in bad frappe patch get set again ( #31659 )
2022-07-21 13:32:03 +05:30
Deepesh Garg
6d61525ae4
Merge pull request #31648 from deepeshgarg007/dimension-patch-fix
...
fix: Patch to make accounting dimension in orders
2022-07-20 19:02:00 +05:30
Deepesh Garg
d46e406db7
fix: Patch to make accounting dimension in orders
2022-07-20 18:59:36 +05:30
Rucha Mahabal
8b67d627d8
fix(patch): Remove missed records for HR & Payroll separation ( #31646 )
...
* fix(patch): delete HR Payroll custom fields from core
* fix: delete HR Payroll dashboard chart, number card, web forms
2022-07-20 18:56:37 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
8ce526115d
patch: Add HR & Payroll deprecation warning
2022-07-19 13:19:34 +05:30
Rucha Mahabal
2ae48fbdd4
Merge branch 'develop' into hr-separation
2022-07-18 10:58:22 +05:30
Sagar Vora
70c4117c22
fix: unlink custom fields in patch
2022-07-14 15:02:37 +05:30
Sagar Vora
be4a44fccd
Merge remote-tracking branch 'upstream/develop' into ic-lingering-code
2022-07-14 14:36:14 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Marica
681b334236
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-11 11:22:51 +05:30
Sagar Vora
93f87cb6e2
chore: remove missed code for India localisation
2022-07-07 16:41:41 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
Rucha Mahabal
2da427c023
patch: do not run deletion patch if HRMS is already installed
2022-07-04 14:54:23 +05:30
Rucha Mahabal
1497e26f82
fix: patches
2022-06-29 18:38:39 +05:30
Marica
1a749e2589
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-06-29 10:25:30 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6f407d3c62
chore: fix code formatting
2022-06-28 12:29:22 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
930e557fc6
fix: remove HR/Payroll patches
2022-06-27 20:25:16 +05:30
Rucha Mahabal
c8712b02f9
patch: Delete HR/Payroll doctypes
2022-06-27 19:59:04 +05:30
marination
9541354ec7
chore: Make image field obsolete in Website Item (redundant)
...
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
2022-06-27 13:00:00 +05:30
Sagar Vora
0aafc75c90
fix: add missing print format
2022-06-26 18:36:00 +05:30
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
