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
Dany Robert
811e51fb50
fix: reload SI meta before checking
2021-12-07 15:21:51 +05:30
Dany Robert
848b641d7b
fix: rename KSA QR field to match localisation
2021-12-07 14:51:05 +05:30
Saqib Ansari
476e81a631
fix: time to respond & resolve indicators
2021-12-06 18:55:30 +05:30
Saqib Ansari
10b87e081c
fix: sider issues
2021-12-06 15:38:19 +05:30
Saqib
8e5b793a0a
Merge branch 'develop' into fix-sla
2021-12-06 14:48:09 +05:30
Anupam Kumar
3928a402d4
feat: CRM Settings ( #27788 )
...
* feat: crm settings
* feat: CRM Settings
* feat: lead and opprtunity section
* feat: added CRM Settings in ERPNext Settings workspace
* fix: review chnages
* added patch
* fix: linter issues
* fix: linter issues
* fix: linter issues
* fix: removed crm settings from selling module
* fix: raw query to frappe.qb
* fix: removed hardcoded value
* fix: linter issue
* fix: simplify CRM Settings migration patch
Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-12-06 13:52:00 +05:30
Saqib Ansari
f9408d170a
patch: split 'ongoing' sla status
2021-12-06 12:38:25 +05:30
Ankush Menat
bdf7b8d379
fix: patch to remove default item group and territory
2021-12-06 11:07:24 +05:30
Rucha Mahabal
235b707417
feat: add default Exit Questionnaire email template
2021-12-05 17:06:29 +05:30
Rucha Mahabal
0ef42d1000
fix(patch): create only component type field instead of running the whole setup ( #28734 )
2021-12-05 12:44:20 +05:30
hrwx
43038aab79
fix: do not add gst fields if no indian company
2021-11-27 21:46:13 +00:00
Ankush Menat
8b33358660
fix: patch failure due to new doctype
2021-11-25 17:41:29 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc ( #28523 )
2021-11-23 18:21:00 +05:30
marination
dc42c45ebb
fix: Move thumbnail updation to different patch
...
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
2021-11-16 17:57:10 +05:30
marination
871e9ca6af
fix: Check if thumbnail column exists in case of table trimming
2021-11-16 17:53:43 +05:30
marination
a97ee918b2
fix: Get db values as dict when checking for thumbnail in existing web item
2021-11-16 17:53:30 +05:30
marination
d7d70ec9e0
fix: Fetch thumbnail from Item master instead of regenerating
2021-11-16 17:52:14 +05:30
marination
ba52d7c23f
fix: Website Items with same Item name unhandled, thumbnails missing
...
- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled
2021-11-16 17:51:01 +05:30
Deepesh Garg
cbfdbd8442
fix: Website item patch fixes
2021-11-16 17:42:04 +05:30
marination
e2b9a38f28
fix: Failing search util import and patch
...
- Use simple function import instead of global variable to check if field is valid to index
- Commit after every 20 items in patch to create web items from items
2021-11-16 17:38:09 +05:30
marination
9aeb211142
chore: Remove Home Page is Products
and Sider fixes
...
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
2021-11-16 17:21:46 +05:30
marination
82f8f3caf2
feat: Guest Display Settings
...
- Re-arranged Settings checkboxes
- Deleted `show_availability_status` from E Commerce Settings
- Added `Hide Price for Guest` functionality
- Added Custom Redirection for Guest Actions in E Commerce Settings
- Minor cleanups
2021-11-16 16:54:21 +05:30
marination
aca3c8fce7
fix: Font size, empty image styles, and minor cleanup
...
- some frappe css font variables weren't loading, remove dependency
- fixed fallback display for missing images in views
- py code cleanup (minor)
2021-11-16 16:48:33 +05:30
marination
b29c5d6e84
fix: Discount Filters and Web templates
...
- Fixed discount filters (didn’t work after js render change)
- Fix Item Card Group template height and style
- Add placeholder to missing images in Product Category Cards template
- Code cleanup
2021-11-16 16:37:08 +05:30
marination
d29b94f46e
fix: Patch fix for fresh installs
...
- minor sider fix
- patch fix for fresh installs
2021-11-16 16:35:22 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +05:30
Ankush Menat
54184e54ed
fix: patch for naming series property setter
2021-11-15 18:18:22 +05:30
Ankush Menat
c96b5492db
fix: reload doctype forcefully
2021-11-10 19:41:55 +05:30
Ankush Menat
ccf84ae88a
fix: patch to update job card status
2021-11-09 18:04:50 +05:30
Subin Tom
d2915c6bc7
fix: fixed company field, updated patch
...
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)
# Conflicts:
# erpnext/patches.txt
2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9
fix: Added company field, filtered account heads
...
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53
fix: Fixed customer address variable, sales invoice item field currency issue
...
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
2021-11-08 13:12:25 +00:00
Deepesh Garg
508832e90a
fix: Add patch to make custom fields
2021-11-08 17:46:24 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Rohit Waghchaure
cae29b71d8
fix: patch update_category_in_ltds_certificate
2021-10-31 09:24:07 +05:30
Deepesh Garg
812249e5d1
Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes
2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d
fix: Rewrite patch using query builder
2021-10-28 19:01:24 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117
...
refactor!: remove hub
2021-10-28 14:07:15 +05:30
Alan
05831b18ad
fix: update production plan status #27567
...
fix: update production plan status
2021-10-27 11:36:37 +05:30
Deepesh Garg
7ab7753bfa
Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes
2021-10-26 20:56:40 +05:30
Deepesh Garg
89d5e494dd
fix: Reload customer and supplier doctype
2021-10-26 19:51:03 +05:30
Deepesh Garg
cd4b20313e
fix: Test case fixes and linting issues
2021-10-25 11:21:55 +05:30
Deepesh Garg
e3ae8d5a1e
fix: Move PAN field from standard doctype to fixtures for India
2021-10-24 17:24:25 +05:30
Deepesh Garg
bf13d183d8
fix: Replace section code with tax withholding category in LDC
2021-10-23 19:00:03 +05:30
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices ( #28019 )
...
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
2021-10-20 19:15:35 +05:30
Chillar Anand
73ae504721
fix(healthcare): Add patch for removing healthcare doctypes ( #27995 )
...
* fix(healthcare): Add patch for healthcare doctypes
* fix: Update healthcare patch
* fix: Reload stale doctypes
* fix: Reload doc fix
2021-10-19 18:59:23 +05:30
Ankush Menat
9c1d828b1b
chore: formatting
2021-10-14 17:18:24 +05:30
rohitwaghchaure
230a5d4b39
Update enable_scheduler_job_for_item_reposting.py
2021-10-14 16:57:54 +05:30
Ankush Menat
3f97413814
chore: formatting
2021-10-14 16:45:27 +05:30
Rohit Waghchaure
efc60ec2b5
fix: patch to enable scheduled job for reposting
2021-10-14 16:03:48 +05:30
Noah Jacob
2bb383b178
fix: not authorized to update entries after freezing accounts ( #27937 )
...
* fix: not authorized to update entries after freezing accounts
* fix: Add test case
* fix(patch): patched to requeue failed reposts(check_freezing_date)
* chore: misc fixes
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-13 16:20:08 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request #27497 from nemesis189/taxjar-nexus-update
...
fix: TaxJar update - added nexus list, making api call only for nexus
2021-10-13 15:08:48 +05:30
Deepesh Garg
2d19e2d54b
fix: Patch
2021-10-13 13:24:19 +05:30
marination
3d5f029e51
fix: Sider and Tests
2021-10-12 17:33:22 +05:30
marination
22f41a17b7
chore: Removed Shopping Cart Module
...
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
2021-10-12 16:54:11 +05:30
marination
37a246e738
chore: Patches for Website Item
...
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
2021-10-12 16:16:17 +05:30
Deepesh Garg
c6a56a8f53
Merge pull request #27884 from nextchamp-saqib/invalid-gl-entry-patch-fix
...
fix: patch fails if accounts are frozen
2021-10-12 13:44:18 +05:30
Saqib Ansari
c103f72fad
fix: rollback on exception
2021-10-12 13:13:48 +05:30
Deepesh Garg
5d4c919c5c
fix: Update pacthes.txt
2021-10-12 13:04:25 +05:30
Ankush Menat
ad444153cc
fix: force reload custom field doctype ( #27909 )
...
custom_field.json has the same modified key in both versions but not the same content. This can happen again if something is backported, safe solution is to force reload.
2021-10-11 22:14:28 +05:30
Dany Robert
7acdcc70ad
fix: v12 migrate error - unknown column ‘mandatory_depends_on’ ( #27897 )
...
* fix: v12 doesn't have mandatory_depends_on field
* fix: move update_vehicle_no_reqd_condition to v13
* fix: move update_vehicle_no_reqd_condition to v13
* fix: file name missing .py
* refactor!: add back empty line
* fix: linters issue
2021-10-11 15:05:55 +05:30
Subin Tom
ea2038489f
fix: 'Taxjar' type fix
2021-10-11 11:11:01 +05:30
Subin Tom
1b25e69af4
fix: patch fixes- force reload doc, check for company
2021-10-11 10:20:23 +05:30
Saqib Ansari
353ad5f6ff
feat: handle exceptions
2021-10-10 11:47:48 +05:30
Saqib Ansari
b0aa4a6e1c
fix: patch fails if accounts are frozen
2021-10-10 11:42:39 +05:30
Subin Tom
eaa3614155
fix: patch fix added reload_doctype
2021-10-07 12:20:56 +05:30
ChillarAnand
a1d3a09d3c
Merge branch 'develop' into care
2021-10-04 09:46:34 +05:30
Deepesh Garg
197e97d9d6
Merge pull request #27665 from nextchamp-saqib/trim-custom-field-length
...
fix: trim sales invoice custom field lengths
2021-10-02 21:36:38 +05:30
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview ( #25482 ) ( #27724 )
...
* feat: Tracking Multi-round interview
* fix: releted to scheduler event and formating
* fix: job applicant UI/UX and conflicts
* test: Interview Round
* fix(test): Employee referral, Employee Onboarding, Job Offer
* fix: sider
* feat: set default value in Hr settings
* feat: added validation for designation
* test: Interview
* test: Added validatiolns for skill
* test: Interview feedback
* fix: sider
* fix: remove unnecessary validations and form label cleanups
* chore: clean-up Interview Round and Interview Type doctype
* fix: remove redundant Rating Value, only keep Rating
* fix: update interview details on feedback submission
- make interview feedback submission dialog minimizable
* fix: show submit feedback button only if feedback doesn't exist
* refactor: Interview and Feedback statuses and workflow
* fix(HR Settings): clean up interview settings
* refactor: Interview
* refactor: Interview Feedback, remove unnecessary validations
* chore: update notification messages
* chore: remove unnecessary formatting changes in attendance list and leave application
* refactor: Job Applicant to Interview mapping
* chore: sorted imports
* chore: sorted imports
* fix: sider issues
* fix: linter issues
* fix: sider issues
* fix: tests
* fix: sorted imports
* fix: tests, sider
* fix: therapy plan test
* fix: sider issues
* feat: Include From Time and To Time fields in Interview for cleaner data
* feat: Interview Calendar
* fix: allow renaming masters
* fix: add more fields to list view and standard filter
* fix: validate overlapping interviews
* fix: update tests
* fix: linter issues
* refactor: replace reminder messages with Email Templates
* fix: sider issues
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-10-01 13:15:40 +05:30
marination
cbffbc3894
fix: reload doc in patch
2021-09-30 14:53:47 +05:30
Marica
cc143bca0d
fix: Maintenance Schedule child table status for legacy data ( #27554 )
...
* fix: Maintenance Schedule child table status for legacy data
* fix: Include legacy draft schedules in patch
* fix: Pre-commit formatting
2021-09-30 14:08:45 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry ( #27629 )
...
* refactor: remove unnecessary list comprehensions
* fix: correct cost distribution logic
While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.
Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.
Solution: only apportion additional cost on FG items
* test: test cost distribution
* fix: patch for additional cost
fix(patch): consider PCV while patching
- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries
consider only FG/scrap item SLEs for recomputation of rates
* fix: remove client side logic for addn cost
All of this is done in python code hence removed client side code.
2021-09-30 09:58:59 +05:30
Saqib
a84cd2674c
Merge branch 'develop' into trim-custom-field-length
2021-09-29 19:56:56 +05:30
Saqib Ansari
f1fcb385f5
patch: trim sales invoice custom field lengths
2021-09-29 19:56:02 +05:30
Saqib
424efd41e5
feat(regional): toggle for reduced depreciation rate as per IT Act ( #27600 )
2021-09-28 18:12:02 +05:30
Subin Tom
54754f4eb8
fix: updated patch, add fields only if fields are checked
2021-09-27 12:51:54 +05:30
Saqib
711395db22
fix: linting errors
2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418
fix: indentation
2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd
chore: log modified invoices
2021-09-27 12:20:16 +05:30
Saqib Ansari
18e5d59d24
fix: unknown column 'ref_exchange_rate'
2021-09-26 20:26:45 +05:30
Saqib Ansari
beebfb323a
patch: invalid gain loss gl entry
2021-09-26 16:58:55 +05:30
ChillarAnand
aa580769a6
chore: Code clean up
2021-09-20 15:27:43 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields ( #27524 )
...
* fix: Tax breakup based on items
* fix: added gst fields,warehouse validation to pos inv,patch
* fix: tax breakup test fix, eway bill hsn fix
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-17 10:39:03 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group ( #27471 )
...
* feat: Merge POS invoices based on customer group
* fix: Linting Issues
* fix: fieldname
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-16 19:33:57 +05:30
Deepesh Garg
c53b78e712
fix: Patch for updating tax withholding category dates ( #27489 )
2021-09-14 20:28:48 +05:30
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items
...
feat: link items to supplier / customer
2021-09-14 13:58:18 +05:30
Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn ( #27430 ) ( #27436 )
...
* fix: fail migration due to None type
* fix: incorrect key: value pair in filter.
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2021-09-11 17:54:55 +05:30
Deepesh Garg
e7e2ce1271
fix: Linting Issues
2021-09-09 11:36:57 +05:30
Deepesh Garg
ee1486209d
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-08 11:33:42 +05:30
ChillarAnand
c8565c7090
chore: Removed healthcare module code in other modules
2021-09-06 20:47:27 +05:30
Anupam Kumar
b0d970001a
feat: multi-currency in Opportunity ( #26590 )
...
* feat: multi-currency
* refactor: lead form
* fix: test case for opportunity item
* fix: removing local changes
* fix: test cases
* fix: test cases
* fix: review changes
* fix: reverting lead.json chnages
* fix: toggle display for currency fields
* review changes
* fix: test case
* fix: linter issues
* fix: unused import
* feat: grand total in opportunity
* fix: patch
* fix: sort imports
* fix: reload opportunity item doctype
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-09-06 16:54:28 +05:30
Ankush Menat
14b01619de
fix: patch failure for vat audit report ( #27355 )
2021-09-06 13:47:56 +05:30
Ankush Menat
73b3a2f685
chore: whitespace
2021-09-03 21:57:38 +05:30
Deepesh Garg
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
...
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4
fix: Patch error and tests
2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e
fix: Patch
2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd
fix: Patch and linting errors
2021-09-03 13:13:37 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure ( #27323 )
...
reload doc is necessary on new doctypes
2021-09-03 12:02:32 +05:30
ChillarAnand
66e92d423e
chore: Added healthcare deprecation warning patch
2021-09-02 20:02:11 +05:30
Deepesh Garg
e1fffdb262
fix: Linting issues
2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
2021-09-02 18:59:59 +05:30
ChillarAnand
5d4133ecac
chore: Removed healthcare demo, patch files
2021-09-02 18:25:36 +05:30
Ankush Menat
60185c8c71
chore: linting
...
[skip ci]
2021-09-02 17:36:05 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes ( #27313 )
2021-09-02 14:53:06 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889
fix: Report and JSON generation for Advances received
2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6
fix: Linting and patch fixes
2021-09-01 10:11:18 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update ( #27143 )
...
* feat: Taxjar Integration update
* added taxable_amount,taxable_amount fields in setup.py
* Update taxjar_integration.py
Sider issues fix
* Sider issues fix
* Sider issues fix
* sider issue fix: unused import
* sider issue fix
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* Removed permission for 'All'
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329
feat: Validity dates in Tax Withholding Rates
2021-08-31 18:23:28 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration ( #27200 )
...
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Shadrak Gurupnor
17e0fa7a8b
fix: patches were breaking while migrating ( #27195 )
...
* fix: patches were breaking while migrating
* fix: Removed duplicate function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 16:42:25 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero ( #27188 )
2021-08-27 10:46:45 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information ( #26107 )
...
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries ( #26932 )
...
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-25 20:32:26 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Marica
112fc888f1
fix: Return Qty in PR/DN for legacy data ( #27001 )
2021-08-18 15:29:48 +05:30
Ankush Menat
8bbec42fa0
fix: undo changes to patch ( #26983 )
...
* fix: undo changes to patch
* ci: ignore empty body / head
2021-08-17 15:14:13 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Deepesh Garg
4b9c127494
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre
2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3
fix: Add mandatory depends on condition for export type field
2021-08-16 14:36:50 +05:30
Deepesh Garg
3f07bb7021
fix: Add mandatory depends on condition for export type field
2021-08-16 13:18:39 +05:30
Frappe PR Bot
a7e0805039
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26879 )
2021-08-10 17:16:15 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26638 )
2021-08-10 16:46:44 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs ( #26863 )
2021-08-09 18:34:51 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report ( #26851 )
...
fix(regional): add permissions for VAT Audit report
2021-08-09 17:58:52 +05:30
Ganga Manoj
458f7f1194
patch: delete all orphaned tables docs ( #26743 )
2021-08-09 17:16:48 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 20:06:36 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Frappe PR Bot
5a442f1bce
fix: change format string to percent string interpolation ( #26774 ) ( #26778 )
...
(cherry picked from commit 7fe588e236
)
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-08-03 13:29:10 +05:30
Anuja
f2ee1155c0
fix: sider fixes
2021-08-02 23:13:21 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext ( #26700 )
...
BREAKING CHANGE: remove Shopify integration.
The integration is moved to a separate app with additional enhancements.
The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.
New app: https://github.com/frappe/ecommerce_integrations
2021-08-02 21:57:52 +05:30
Alan
7fe588e236
fix: change format string to percent string interpolation ( #26774 )
2021-08-02 20:07:55 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
Anuja
3bcbc86291
fix: resolved conflicts in patches.txt
2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8
fix: added patch for custom field and minor fixes
2021-08-02 12:54:30 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest
2021-07-28 18:24:29 +05:30
Deepesh Garg
6ac68f3bc7
fix: Patch
2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d
fix: Chnage fieldtype from data to check
2021-07-28 17:18:50 +05:30
Deepesh Garg
fa8e6ac7cd
fix: Patch
2021-07-28 15:30:05 +05:30
Deepesh Garg
9350249941
fix: Chnage fieldtype from data to check
2021-07-28 12:57:59 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch ( #26668 ) ( #26681 )
...
(cherry picked from commit ac2e139d5b
)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-07-28 00:19:32 +05:30
Raffael Meyer
ac2e139d5b
fix: force reload of Opportunity in patch ( #26668 )
2021-07-28 00:14:59 +05:30
Frappe PR Bot
b122a1eaa0
fix: reload manufacturing setting before patch ( #26641 ) ( #26670 )
...
(cherry picked from commit c8d7a8c781
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-27 16:59:06 +05:30
Ankush
7a97b6d6a8
fix: reload manufacturing setting before patch ( #26641 )
...
(cherry picked from commit c8d7a8c781
)
2021-07-27 11:19:33 +00:00
Ankush
c8d7a8c781
fix: reload manufacturing setting before patch ( #26641 )
2021-07-27 16:39:38 +05:30
Deepesh Garg
a661667e2a
fix(India): Default value for export type
2021-07-26 18:46:14 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. ( #26585 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
2021-07-25 13:10:50 +05:30
Deepesh Garg
328444b530
fix(India): Default value for export type
2021-07-23 20:28:02 +05:30
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 ) ( #26564 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:46:34 +05:30
Rucha Mahabal
a758071532
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:24:09 +05:30
Rohit Waghchaure
56e4a88956
fix: added patch to fix missing FG item
2021-07-16 15:06:57 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance ( #26173 )
2021-07-12 20:21:07 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
Rohit Waghchaure
c878389050
fix: or condition filter in the get_all
2021-06-24 18:14:18 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI ( #26184 )
2021-06-24 14:26:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI ( #25837 )
2021-06-24 10:09:02 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla ( #26053 )
2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document ( #22449 )
2021-06-14 19:05:52 +05:30
Gavin D'souza
137d08a9d7
fix: Manually link_fields from flags before rename_doc
2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308
fix(patch): Handle NULL values from fieldtype change
2021-06-10 15:08:55 +05:30
Gavin D'souza
aedf25ba46
chore: Drop old patches
...
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
2021-06-10 15:07:39 +05:30
Gavin D'souza
102afe7de1
fix: Manually link_fields from flags before rename_doc
2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc
Revert "fix(patch): Reload linked doctypes before renaming dt"
...
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9
fix(patch): Reload linked doctypes before renaming dt
2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1
fix(patch): Handle NULL values from fieldtype change
2021-06-04 17:07:45 +05:30
Gavin D'souza
5bf5775b43
chore: Drop old patches
...
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
2021-06-04 11:49:56 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes ( #25904 )
2021-06-01 11:56:00 +05:30
Anuja P
e2059fb9f6
fix: spaces to tabs
2021-05-26 20:07:53 +05:30
Anuja P
5e4128e70c
fix: patch for existing issues
2021-05-26 20:03:14 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event ( #25782 )
...
* feat: Some Minor fixes
* fix: patch file
* fix: patch
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-05-24 20:24:20 +05:30
Rucha Mahabal
0d8b9a9d0a
fix(patch): billable field not renamed
2021-05-20 19:53:30 +05:30
Anupam
1270febfff
fix: sider issues
2021-05-20 14:15:58 +05:30
Anupam
aeb88385bb
patch: timesheet changes
2021-05-20 14:11:36 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
cab998c293
adding patch
2021-05-15 20:40:20 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes ( #25249 )
...
* fix: RCM tax calculation
* feat(India): ITC Reversal via Journal Entry
* fix: Reverse Charge booking logic and validation
* fix: Addd patch for availed ITC fields
* fix: Hooks method to update availed ITC field
* fix: Cleanup and fixes in GSTR3B report
* fix: Update params in GSTR-1 report
* fix: Debit note using Sales Invoice
* fix: Setup and patch
* fix: GSTR 3B report cleanup and updates
* fix: Add method to get invoices liable to reverse charge
* fix: Add taxable value in Purchase Invoice Item
* fix: Inward supplies liable to reverse charge
* fix: Linting issues
* fix: GSTR3B report test
2021-05-14 12:17:41 +05:30
Shadrak Gurupnor
f648d2d7c4
fix: added tax_types list ( #25587 )
2021-05-07 12:15:19 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure ( #25595 )
...
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
2021-05-06 17:02:47 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field ( #25555 )
2021-05-06 16:10:55 +05:30
barredterra
24e2cc9107
Merge branch 'develop' into datev_fixes
2021-05-03 18:19:28 +02:00
Rohit Waghchaure
2fb573781d
fix: rename field has not updated value of deposit and withdrawal fields
2021-05-01 17:56:40 +05:30
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes
2021-04-27 12:21:14 +02:00
Ankush Menat
9178d95cca
fix: can not create item variants ( #25433 )
...
* fix: item_code assigned to function returning None
* fix: ignore has_variants and attributes in variant
* fix: patch to remove has_variants and attributes
* chore: fix whitespace in translation
2021-04-26 15:37:17 +05:30
Anoop
c21ce42559
fix(patch): lab module patch fix ( #25447 )
...
* fix(patch): lab module patch fix
* fix: param
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-22 22:44:44 +05:30
Rucha Mahabal
e3b8057eb4
fix: Laboratory Module patch ( #25431 )
2021-04-22 16:11:17 +05:30
Ankush Menat
e972ceb798
fix: patch for updating shipment status
2021-04-18 13:22:19 +05:30