Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…8a1891 c8a1891f8a Merge branch 'release/4.0' 58e3ee8b38 Merge commit 'fab8d900274f2ab4822280f61f179b74307d349c' e12af400fe Merge commit '6e65bfbc703958cacaeaf25cef5fae6040e842eb' 6dcfbaf2e6 Merge commit 'e572be775f0196ad9931e8bf49c9e3e2d4f6d618' 3f7c16ae8f Merge commit 'e3bbb1bbdd8a07571e6d21cbc141d93ed353c1d4' 794bba4aa1 Merge commit '37d46c202ff627e635014c96936e95e09be7d833' 43e6c251a4 Merge branch 'feature/MAR10001-1039' into feature/MAR10001-0-order-allocation 1cae79f97a MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixed normalizers - fixed community version - updated .lock files 5d6666fee6 Merge branch 'feature/MAR10001-1039' into demo-allocation-branch-50 a771001585 MAR10001-1039: Upgrade OroPlatform to 5.0.x - removed JMS - fixed functional tests that used _token parameter in the request - fixed skipped template path usage - made user fixtures compatible with oro 128e6afc12 Merge branch 'demo-allocation-branch' into test-branch 5f45e120b4 MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixing api + extended entity collection methods for Product a9e3f431a6 MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixed assets issue - fixed controllers usage - fixed twig templates usage and twig constructions - fixed repositories usage 750231dc0c Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch 4348400b77 Merge branch 'develop' into feature/MAR10001-0-order-allocation 77b295d0fd Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch 3435d65b55 feature/MAR10001-0-order-allocation: - Added transition eventlistener to create ReplenishmentOrders for allocations that are suballocations for a consolidation order 133851761c Merge branch 'feature/MAR10001-788-order-consolidation' into demo-allocation-branch 37bc4ea630 Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch aca2182434 feature/MAR10001-1039: - Updated monolog config for production due to memory leak resulting in sigterm kills of process 4042c3c28d MAR10001-1039: Upgrade OroPlatform to 5.0.x - initial commit 15f1779987 Merge branch 'bugfix/MAR10001-0-fix-issue-with-missing-dependency' 243ed7fd3e Merge branch 'bugfix/MAR10001-0-fix-issue-with-missing-dependency' into develop 8047ff14a4 feature/MAR10001-788-order-consolidation: - Added consolidation enabled column to Order entity table 2836e51ec9 Merge branch 'develop' into feature/MAR10001-0-order-allocation 041b8881be MAR10001-1016: Simple Integration Status monitor - added MarelloHealthCheckBundle - created grid + dashboard widget 1fdc0778ab Merge commit '4861529cedd1765613434503bc084b74a5cffddf' into maintenance/3.2 fab8d90027 - remove locks 0e91fd6632 - remove locks 3f19c94a42 Merge branch 'maintenance/3.2' 0beb88cf2d Merge branch 'maintenance/3.2' 92c3f8d51d - prepare 3.2 CE release 756df9e8dd - prepare EE 3.2 release 321238a37c Merge commit '0e5c853ef17f503cf68829ceff886c53390327c3' into maintenance/3.2 24db399e7b Merge commit '0e5c853ef17f503cf68829ceff886c53390327c3' into maintenance/3.2 0e5c853ef1 Squashed 'package/marello-enterprise/' changes from c0f33b1479..279fe1bc86 6e65bfbc70 Merge branch 'maintenance/3.2' e572be775f Merge branch 'maintenance/3.2' d90f7b075b Merge branch 'maintenance/3.2' 42385d5ea3 Merge branch 'maintenance/3.1' 9ecf753543 Merge branch 'maintenance/3.1' fbc2f39d78 Merge branch 'maintenance/3.1' ba6baff5da Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' a649a8de66 Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' a6319f4c9d Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' deeaefcbe0 Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' b383d53b5d Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' 1dc7d12c9e Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' 8e1cf7a777 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' 7ef749a1b0 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' 2958e409c4 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' eec4645631 Merge commit '9536aace135ecd468733ef940ba39f116809abfe' 3164365192 Merge commit '9536aace135ecd468733ef940ba39f116809abfe' 2bd702044d Merge commit '9536aace135ecd468733ef940ba39f116809abfe' f2fad9d4b0 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' b2d94e7a75 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' 927bf14733 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' 0006463c5d Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' dcfd5af0c4 Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' 4a070560cc Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' f3f8fe434d - prepare release CE c8f39ac2eb feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 5162fafb9f feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 6c8b6e7791 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 8d09a3ff82 MAR10001-1006: Update platform to Oro BAP 4.2 - update dev.lock with the latest version of oro d1838f8b87 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 ba2ce17fa2 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 87e7c9fe11 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 48debe89d0 Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 0d7637824d Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 dfd8683201 Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 050f0fba37 - prepare 3.1.1 application release 3901f5f6e4 Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 a923e94d19 Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 9184f9637b Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 a2e75c0a0b Squashed 'applications/marello-application-ee/' changes from 2c693602ba..7a2dcc27c6 1d99ac4c33 bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop 5718cfeca1 bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop b93b92856e - removed debug lines from refund totals view dbcaf49a1a MAR10001-1006: Update platform to Oro BAP 4.2 - fix the last functional test 3dd23fba70 MAR10001-1006: Update platform to Oro BAP 4.2 - fix failed yaml file after merging 88489d2bbd Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 7ca034fbde MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 8e751249c5 MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 94084e540a feature/MAR10001-1006-update-oro-platform-42: - PSR2 fixes 03bd945c9a feature/MAR10001-1006-update-oro-platform-42: - Fixed issues with data fixtures for Refund functional tests - Updated missing translations for Refund related entities 9cd0eed406 feature/MAR10001-1006-update-oro-platform-42: - updated environments with build image of marello-application && marello-application-ee - removed old environment setup files - added dev.lock for marello-application 8f588d58e7 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist d5fe1a4813 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 891b5dfd74 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 6c3587a315 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 6d4a55c76c Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 407dbe1c5e MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 45467025a6 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 1e6e257078 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 4fbc19b1a8 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade 5eab4fee73 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade ef7346a22a Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 6cc750fff1 Merge branch 'feature/MAR10001-827' into develop cc63a0cdbe Merge branch 'feature/MAR10001-1002' into feature/MAR10001-1006-update-oro-platform-42 e0feed709f feature/MAR10001-1002: - Changed translation to be workflow related instead of Sales channel assignment 5198241bb3 feature/MAR10001-827: - fixed minor issues with tax calculations - updated views to reflect new tax calculations - added additional fields for refunds and refund items to store the taxes and subtotals 26427b38a6 MAR10001-1002: Transit workflow Mass action(s) - created new workflowtransit mass action with sync/async processing - added email report after async or failed processing - added documentation 45e89a01bf Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 8e22013a3c Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 18c52b4911 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 7a9bdd7d3c feature/MAR10001-827: - Fixed minor issues with refund totals - Split totals and balance on refund create - Added totals and balance update based on input e682e2a6db Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform c2c2f012f6 Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 840b0d158f Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 19dae8dfcd feature/MAR10001-827: - Renamed old view(s) from totals to balance as this will now represent the balance of all refunds for this particular order eb9698bda4 feature/MAR10001-827: - Changed calculations for showing refunds total (all refunds combined) - Added header for view specifically for totals - Removed unnecessary code from RefundTotalsProvider - Updated keys from amount to refundtotals / refund_totals - Updated translations 341e887bfd [WIP] feature/MAR10001-827: - Removed updated/created at from create/edit and view page - Changed OrderItem:price in refund item to OrderItem:purchasePriceIncl - Added tax and tax code fields in item grid on refund create page - Added tax totals and subtotals to Refund entity 905c5a3579 Merge branch 'bugfix/MAR10001-868' into merge-branch a2266f3891 Merge branch 'maintenance/3.1' into develop ed49174f54 Merge branch 'maintenance/3.1' into develop 768a6b1019 Merge branch 'maintenance/3.1' into develop 627fe5a327 feature/MAR10001-981: - Removed receivedAt from Return create as it is illogical to set a received date without being received - Added receivedAt as option for default workflow transition from pending to received - Made receivedAt and trackAndTrace code fields nullable in DB 5e6d03821e Merge branch 'bugfix/MAR10001-986' into feature/MAR10001-981 69f3f20939 bugfix/MAR10001-986: - Fixed translation key for company on return view - Removed created/updated at from return view general information - Moved saleschannel form field rendering to generalInformation block in create ad97adbc58 Merge branch 'bugfix/MAR10001-986' into maintenance/3.1 6e03b6aa55 Merge commit 'a9026146d19fc6cd027e1046e302574c90caced3' into maintenance/3.1 3c6b67188b Merge commit 'a9026146d19fc6cd027e1046e302574c90caced3' into maintenance/3.1 0b2497e159 Merge branch 'MAR10001-PR70' 13989822b6 Merge branch 'MAR10001-PR70' bd746f0280 Merge branch 'MAR10001-PR70' 42436f4710 Merge branch 'MAR10001-PR70' ec10461562 Merge branch 'MAR10001-PR70' into develop 1a43b16deb Merge branch 'MAR10001-PR70' into develop 3055661082 Merge branch 'MAR10001-PR70' into develop 2aa0d9f0d4 Merge branch 'MAR10001-PR70' into maintenance/3.1 bcd98a0be7 Merge branch 'MAR10001-PR70' into maintenance/3.1 908ac83456 Merge branch 'MAR10001-PR70' into maintenance/3.1 1ff9042bd3 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 ad4654ec92 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 a813b5b8c3 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 5140659352 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 35960e7bce Merge branch 'MAR10001-PR68' into develop c4232edea6 Merge branch 'MAR10001-PR68' into develop fff2f46db3 Merge branch 'MAR10001-PR68' into develop e4fba070df Merge branch 'MAR10001-PR68' d72fe657cf Merge branch 'MAR10001-PR68' b0b7b70c63 Merge branch 'MAR10001-PR68' e753e8bc15 Merge branch 'MAR10001-PR68' d16c3e62fd Merge branch 'MAR10001-PR68' into maintenance/3.1 36336dbb0e Merge branch 'MAR10001-PR68' into maintenance/3.1 38587d94ec Merge branch 'MAR10001-PR68' into maintenance/3.1 fa3b3cd14f Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 836040fe45 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 a0dcec31f2 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 5b5679adcb Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 769586ae5b Merge branch 'maintenance/3.0' 3a07f03a22 Merge branch 'maintenance/3.0' d7b6e5f98a Merge branch 'bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0' into develop e86d3471f6 Merge branch 'bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0' into maintenance/3.1 36e1386f17 bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0: - Fixed issue with balanced inventory going below 0 if there is more reserved inventory on the balanced inventory than there is actual inventory to be balanced af7eb4e77b bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0: - Fixed issue with balanced inventory going below 0 if there is more reserved inventory on the balanced inventory than there is actual inventory to be balanced b428699cb2 Merge branch 'maintenance/3.0' dca60fbd40 Merge branch 'maintenance/3.0' 013142ed07 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.0 ef0e7f32ff Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.0 7be23d91b0 Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 4f39aec27a Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 4de282982b Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 74765447dd Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' f29ea6b158 Merge branch 'maintenance/3.0' db62206ca7 Merge branch 'maintenance/3.0' 7d95094290 Merge branch 'maintenance/3.0' 5b4e945802 Merge branch 'maintenance/3.0' 07cf508d4e Merge branch 'maintenance/MAR10001-0-update-environments' into develop d82104c52c Merge branch 'maintenance/MAR10001-0-update-environments' into develop 059ac10aca Merge branch 'maintenance/MAR10001-0-update-environments' into develop 42ec3a7e5d Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 5a1266be86 Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 fd736159a0 Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 1208b2253a bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid: - Fixed issue with search on orderReference and orderNumber in both Refund/Return grid bead7030f6 bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid: - Fixed issue with search on orderReference and orderNumber in both Refund/Return grid d3ae6556e8 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 17d433d8c7 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3fbba45e19 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 5c1bb3f682 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 dafaf5bd96 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 46f3992a80 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 602d2a2f8f Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 eda6f25968 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 1f76aac3fc bugfix/MAR10001-998-patch-issue-with-refund-validation: - Moved validation for Refund to the complete Refund instead of items - Added currency symbol and formatting to the refund items price - Removed the exception from the subscriber that is interfering with the validation - Added validation to prevent negative refund amount on items 900b675c47 bugfix/MAR10001-998-patch-issue-with-refund-validation: - Moved validation for Refund to the complete Refund instead of items - Added currency symbol and formatting to the refund items price - Removed the exception from the subscriber that is interfering with the validation - Added validation to prevent negative refund amount on items d343b84e48 - Prototype part 2 a8760c87fd task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled 9f3d932ed1 - added hasColumn() checks on fields that might already be added in previous version 06c6a2948f Merge branch 'task/MAR10001-0-order-on-demand' into develop b381c6c6c7 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 a0a831bac7 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 9bdcb5f234 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 934f72267e Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 f7c3d90fe2 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 ee0f8e577a task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand 427da51dcf Merge branch 'task/MAR10001-0-order-on-demand' into develop 817c6c2e76 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 2f01383a05 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 ba58809f0b Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 d598f64be0 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 5391c9c9d9 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 3584af6c21 - fixed refunds fa48a77166 - Fixed namespaces and classes f3ba5aab60 - Fixed namespaces and classes 9faf259599 - Fixed namespaces and classes Registry/ObjectManager - Switched fields expiration date and purchase price on inventory batch view/edit 7eda473193 - Updated namespaces && classes for ManagerRegistry and ObjectManager - Removed deprecated workflows - Added additional error message for when consumers aren't running and return flow cannot be completed because of that 5166a9f947 MAR10001-868: Fixed new created refund. Removed unused code 6b7de7d08b Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform c86263b7b3 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 2b702d3604 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 731732811e Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into maintenance/3.1 38a655ba62 - Fixed issue with schema update with updating table because of foreign key constraint a82942bfca Merge branch 'feature/MAR10001-988' into develop 4102983adf Merge branch 'feature/MAR10001-988' into maintenance/3.1 a213c6b018 MAR10001-988: Minor fixed version of migration and create view changes 8e38e69f5f Merge branch 'feature/MAR10001-987' into maintenance/3.1 97521f48ed Merge branch 'feature/MAR10001-987' into develop 47ec7b1059 - updated platform to 4.2.3 on all main applications and combinations bd3b906e03 - updated platform to 4.2.3 on all main applications and combinations b5d883c0d9 - updated platform to 4.2.3 on all main applications and combinations d40a92e17a MAR10001-968: Fixed unique name fields - unique on both: name, organization 715712fb0b Add new reason for return items 80bbc82223 Add additional fields to Return Entity, update views 9d50318ee6 MAR10001-988: Add additional fields to Return Entity 9b9fe64697 Disable refund if refund submitted in order total amount 6a1c2b223f Merge branch 'develop' of github.com:marellocommerce/development-mono-repository into develop 16ecea2e1b Fixed when change a refund - calculate refund totals values 4326c3006b - fixed merged conflict 95385a3b2b Merge branch 'feature/MAR10001-984' into maintenance/3.1 84dd344f9b Merge branch 'feature/MAR10001-985' into maintenance/3.1 c77ae590bd MAR10001-985: Rename Tabs/headings on the Return view page 8feec132e3 Add Customer information to Return view f53907f968 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 1bae8cd5e9 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 5067315595 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 48e2baf432 - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages abbc3fd12a - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 91ca20ff2c - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 62086c9202 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 72b788b8f6 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 32e9ef2e3d Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' dca587186e Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' efd26dbcac Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' into maintenance/3.1 588f418158 Merge branch 'task/MAR10001-0-add-product-status-validation' into develop 6c4c4ea40d task/MAR10001-0-add-product-status-validation: - Added check for product status before balancing inventory for said product - Added validation + validation message for Product status 73268264aa Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop e661a0f571 Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop 2912aec318 Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop 30cd7f3c3a - added company number column, filter and sorter 7249fe2ae2 Merge branch 'merge-service-points-30' into maintenance/3.1 60a0845d56 Merge branch 'merge-service-points-30' into maintenance/3.1 4ba331e35d Merge branch 'merge-service-points-30' into maintenance/3.1 b78ac3d7cf Merge branch 'feature/MAR10001-880' into merge-service-points-30 29e31b652b Merge branch 'feature/MAR10001-880' into merge-service-points-30 fdd1425667 Merge branch 'feature/MAR10001-880' into merge-service-points-30 ff5840ed1b - fixed dev lock 4918dbf7bc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 9a97c2574f Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 935e9ee0da Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' d52c2ca5e4 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' 292f519425 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' ac4e8b8367 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' e8749bd057 - fixed issue productUnit being submitted on order create, field should not be submitted at all dab670b110 - fixed issue productUnit being submitted on order create, field should not be submitted at all f0d2e6a1aa Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 b0ba383194 Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 ea5520ec11 Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 6dca2f914f Squashed 'applications/marello-application-ee/' changes from 0ec7b8203d..2c693602ba 14cf448bca Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' da5e33361f Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 1429434b97 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' acbb6d81e3 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' bee45cf84f Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 7b3b196d0d - remove locks from master c673edf9c9 - remove locks from master 000b968307 Merge branch 'release/3.1' c7cc25978e Merge branch 'release/3.1' fbe6998113 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' e5bfe2b65a Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 42cb65b63e Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 466aa72d80 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 7620a00274 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c4b6e750e8 - Preparing release changes 8fc7898ce3 - Preparing release changes df48ae575b - Preparing release changes 15fbabcec1 Merge branch 'release/3.1' d80705c83c Merge branch 'release/3.1' ddc115289d Merge branch 'release/3.1' 2be610485d Merge branch 'release/3.1' 9d60aab739 Merge branch 'release/3.1' c9c2c5bf8a Merge branch 'release/3.1' 3ac2782f9e Merge branch 'release/3.1' 6b2714be79 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' b7df2ced63 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 9d7f1ffcfd Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 646c2a7d45 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 9844a91ea5 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c9dd9a7e5d Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c4d74b57fa Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c0d61547e5 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 9be5bc3877 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 7782fd9c24 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 28a8259a61 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' cdcc1506d6 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 3ee7e48a6d Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' dbcd9e8b59 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ba0ce71e0b - preparing release b110da6fbd - preparing release 582e4796b1 - preparing release f688b50538 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's ca47f3cca9 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 0dcab9ced7 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's dc85fb40f5 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 564f132669 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 443cc8b60f - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's c41c15110e - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 22397d3dc9 - fixed layout on payment popup on Invoice/Creditmemo 9465afdc47 - fixed layout on payment popup on Invoice/Creditmemo cc33c5ac63 - fixed layout on payment popup on Invoice/Creditmemo f17b373a72 - Added product unit as additional information to OrderItem on order create 968dfcf75c - Added product unit as additional information to OrderItem on order create 9c0805f1e5 - Added product unit as additional information to OrderItem on order create abdb830d3b - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 29cd362aac - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 207ab18c76 - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 5612933352 - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages e060f3794a - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 6cdba9e07e - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 41316ec514 - added manage batches inventory link on inventory level grid on inventory item view 2d0aee8f24 - added manage batches inventory link on inventory level grid on inventory item view 280b221a2e - added manage batches inventory link on inventory level grid on inventory item view e88e920f8e - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 9e68b871b3 - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 5b1f26b6ae - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 2e629b27fe - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 5adca2d841 - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 58b9be4595 - Added taxIdentificationNumber below company number on invoice entity view 000dcf379c - Added taxIdentificationNumber below company number on invoice entity view f9e6fa63b1 - Added taxIdentificationNumber below company number on invoice entity view d6301d05b7 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 5a41136389 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop ccbf12911a Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 022ef1cf61 - Added small changes for batches; - added delivery date to batch form 1e179b6f07 - Added small changes for batches; - added delivery date to batch form 2c93950ff7 - Added small changes for batches; - added delivery date to batch form 6e84022f8d - Added small changes for batches; - added delivery date to batch form 60dc58e38e - Added small changes for batches; - added delivery date to batch form e388935ab9 - Fixed issue with selecting organization when creating products and purchase order e78d01e15f - Fixed issue with selecting organization when creating products and purchase order 1bae8129db - Fixed issue with selecting organization when creating products and purchase order ac4434b31f - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip debbd9f0db - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip f8c7d7e4dd - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 01e83b08bc - Added organization to query for finding a specific sku for an organization a8317801d2 - Added organization to query for finding a specific sku for an organization 3fdb8c7b5c - Added organization to query for finding a specific sku for an organization b131e18705 - removed old query reference 5f4f0254d3 - removed old query reference dd0b0002e9 - removed old query reference c4a592aeeb bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 83badc9bf2 bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 0f1191592f bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 7cef74f82f - Added different calculation for total due on order view 2bd300f915 - Added different calculation for total due on order view e07665620e - Added different calculation for total due on order view 93fae97198 Merge branch 'bugfix/MAR10001-0-deployment-type' into develop dfdf03c807 - Added deployment type to parameters dist 01cf94a008 - Added deployment type to parameters dist 1d0c1d56c1 - Added deployment type to parameters dist dae0a29474 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 287750fecb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid e87a4988bb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3cede794ad - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 4c6a058db5 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname e3868bd6d7 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 468cb34678 Merge branch 'develop' into feature/MAR10001-930 1e1a5486e6 Merge branch 'develop' into feature/MAR10001-930 5161e0dc29 Merge branch 'develop' into feature/MAR10001-930 bc22c7b02f - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 62ea4952b4 - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 89284c7368 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver dbc8defaa3 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver 94d467e20e - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver c76ce7b2a3 - added hasColumn() checks on fields that might already be added in previous version ee01c68790 - added hasColumn() checks on fields that might already be added in previous version 3f4cce348d - added hasColumn() checks on fields that might already be added in previous version d37fb2f87f - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 1a3639e998 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 774a0c7490 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 3896c6a4b2 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 31edb26d40 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 224dac710b - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 2094b8cf33 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 01cf685ba1 - Added fix for query on postgresql where customer tax identification is copied to company tax identification ea9e32633b - Added fix for query on postgresql where customer tax identification is copied to company tax identification 7698d64336 - Updated auto complete label in warehouse select result a1bc0e6149 - Updated auto complete label in warehouse select result 09e90351ba Merge branch 'develop' into feature/MAR10001-894 5ba6a0387a Merge branch 'develop' into feature/MAR10001-894 96153fe160 Merge branch 'develop' into feature/MAR10001-894 1114b665ed Merge branch 'develop' into feature/MAR10001-894 f97ed63adc Merge branch 'develop' into feature/MAR10001-894 9ff7020eaf Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 9f3ab2f01a Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 167914be40 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 9ca5b342fe Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 30868b4c8b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 7e74c1e45d Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop c23d429fcd - Added minor fixes to purchase orders view and form 430ab3bb43 - Added minor fixes to purchase orders view and form 68a27031b9 - Added possibility to update cost via marello-supplier-product-grid dde294954d - Added possibility to update cost via marello-supplier-product-grid e2803cd7fc Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 cafa75d2db Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 eff2d014a6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 667f4eb92a Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 a72855bef3 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 bd610c9fe6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 4f6daa0fd1 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 bfcacc7924 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 0106f8a6af Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 d3783f294c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1c28c9ce6c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 dd1fc54c82 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2f2c637e5f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 ef545d71ea Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 f77b7fe9e9 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 455eddd360 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9bf8fdef63 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 193d3fea6f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 dbf681173f Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 32c5da7959 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 6b79a0e49b Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 158709d60e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 54c8d906fa Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 3baa45e432 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 4fe0a27217 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 77f4e7d52a Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 20aa67991d Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 18fa4e9a86 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 7ebf9da685 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 668807adf4 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 c773624c19 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 fa8c7365e9 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 f43a14f52c Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 36d32c1249 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 9a5de91019 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 8758592c62 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 28dba967a0 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 5582224fde Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 03b2e7d2e1 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 2d021771e4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 91d136e4c4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 06235763a6 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 206a89b737 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop b75b6e3c74 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 3a6fd4c389 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty b383b8138d - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty f24d48ed8c - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 96d3c3da5f - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 7b5b79b442 - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 747adb97af - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data 497285847f - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data c705b2c200 - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data eb19d4a8ad Merge branch 'develop' into feature/MAR10001-935 afe10013b2 Merge branch 'develop' into feature/MAR10001-935 08049b002c Merge branch 'develop' into feature/MAR10001-935 ea5c5088b5 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop b80a45a604 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop 31fe08959d Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop a094c2634f - added additional check before loading the purchase price in the Purchase Order Item 2a9faf61cd - added additional check before loading the purchase price in the Purchase Order Item 15b4e6cb17 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 2b1ffd9160 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 16c15423a2 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 087ed4444a - Added support to display extended fields on SalesChannel view & grid 40d84ffe1d - Added support to display extended fields on SalesChannel view & grid bfa263ae83 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 3396437ff1 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 8b2ba42502 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 20fde261ad - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration b943ecde6d - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 54f2d06e8e Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 4272c01b92 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 89ad052cf2 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 01fbdd19db - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 8ea2cd21c2 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid fff6c382ba Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' f409304860 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 2f38d38d89 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 0ef6266f40 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 2759c63d9b Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop 42f96be742 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop 89929b2130 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop fd7bff72f7 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number d4ffe67899 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number bb2f91c41b Merge branch 'bugfix/MAR10001-966-product-categories' into develop e9bdca05ad Merge branch 'bugfix/MAR10001-966-product-categories' into develop 977d0c78e7 Merge branch 'bugfix/MAR10001-966-product-categories' into develop a61fefe603 - updated product category grid on the category view to take the localized value of product name into account b80ea4d666 - updated product category grid on the category view to take the localized value of product name into account dc38902182 Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 52ea970fdc Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop ef929bbabe Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 0d046ca00d - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 68a34c4f05 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 03e80ec3a6 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop e997c2938b Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 0b0b2d94c0 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 59a5feccdb - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 576d4b4f84 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 92c620677e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop d455e77b8e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 70469141f3 Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 8ab3d7e3f8 - added default ACL config value for Tax Related entities d47846ac55 - added default ACL config value for Tax Related entities 2c90732536 Merge branch 'task/MAR10001-0-layout-fixes' into develop b594eab854 Merge branch 'task/MAR10001-0-layout-fixes' into develop dac4dc3188 Merge branch 'task/MAR10001-0-layout-fixes' into develop 57e9233303 Merge branch 'task/MAR10001-0-layout-fixes' into develop 1cfd56bd38 Merge branch 'task/MAR10001-0-layout-fixes' into develop be9bc2fa78 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 8cd21c566f - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 7f3d36c199 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 1cac787f14 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 4ed8185f33 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 523ae78a3e Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 2954aa3a72 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop c59a474ba0 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop e2ec1d775e Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 3742532428 - fix issue with trying to display data based on an entity that isn't available 69df3b84b5 - fix issue with trying to display data based on an entity that isn't available 55eb3bfdb1 - fix issue with trying to display data based on an entity that isn't available 6ac00f0649 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 0339533106 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 635b95d3bd Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 1d01d7ee8b Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' ee8b561249 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' ea7a6f8020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 78bff7f0ce - Added shipping method details to store additional information regarding the shipping method on the Marello Order 118a760896 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 277b7b6c9f Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 76b9c1c270 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 867815803e Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 2fc02ae6dc Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 6a1f95564c Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 640751dc64 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 45c33db503 - Added rendering for additional data block with dynamic entity fields cbc7d50021 - Added rendering for additional data block with dynamic entity fields 14058eedef - Added rendering for additional data block with dynamic entity fields cad063bee1 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e0d3f5d967 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e6a0344817 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop 359e5f74ba Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop 09708ba6a8 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e989f1fc2d - Added context option check for forceFlush in the inventorylevellogrecord 3b49897071 - Added context option check for forceFlush in the inventorylevellogrecord c185fb1e44 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 9943c2241a Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 131e3b5d63 Merge branch 'task/MAR10001-0-validation-fixes' into develop b256f6567d Merge branch 'task/MAR10001-0-validation-fixes' into develop 17b1a7558c Merge branch 'task/MAR10001-0-validation-fixes' into develop f298a72c0f - Updated validation groups for Order validation - Added SKU to the available inventory validation message 6e8fc2bac8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message a8827625f5 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop d3b061686c Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop 3d8c66ee62 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop e9202e08c1 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 10f5e5a917 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 298078c1fb Merge branch 'maintenance/3.0' bd29a55f96 Merge branch 'maintenance/3.0' f14ebf3682 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 4d029e0a1d Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 555426370c Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 8ba3d9fc9e - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d33c6381c - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 114b508780 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop e973eb8ba0 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 35883ca734 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop a987a95dec Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop dd4f67f6c9 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop b2f03748ce Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop d6e420f96b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal 76800e09e4 - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal a6045d1519 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 342c799e17 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 490196e5c4 multiple fixes 1ba0c3e52a multiple fixes 3f06d614a7 multiple fixes 7a56ff54b1 multiple fixes c5c10e837e multiple fixes d062de0b81 multiple fixes 5ccbb54a33 multiple fixes 5ecd69d938 multiple fixes a68a19e0fb Merge branch 'maintenance/3.0' 310d9d3771 Merge branch 'maintenance/3.0' 23fe6937ec Merge branch 'maintenance/3.0' d979b1fc14 Merge branch 'maintenance/3.0' 6f34f88cbf Merge branch 'maintenance/3.0' f407c95271 Merge branch 'maintenance/3.0' 0a97e336bb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 994018b6b9 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 dde3fa2bb0 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 b48c0cc790 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 463b03d7b0 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 e19f59023c Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 c9908e12ec - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 817c626ab9 - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 68db65f41d - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5871e21a0d Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 5e319bcb99 Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 5ffa1a8910 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 36185ab409 Merge branch 'maintenance/3.0' into develop 00cc1f1002 Merge branch 'maintenance/3.0' into develop f7824f46b1 Merge branch 'maintenance/3.0' into develop 4f65e8c8fb MM-42: Test and fix functionality (#66) 92bfd1afaa MM-42: Test and fix functionality (#65) a8bacc7078 MM-40: Test and fix import order functionality (#63) 4817829be9 MM-38: Implement sync processors (#61) 019a1bf6b1 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1000f2aef1 Merge branch 'task/MAR10001-0-cs-fix' into develop 266b6801d7 Merge branch 'task/MAR10001-0-cs-fix' into develop 0abc2d46e6 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e03adedeaa Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e2b15f0dc8 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop 9337f24e86 - fix indentation of the if statement in the strategy for clarification on where the if statement ends d7558a553b - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit a2792d890a Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 8e3b617483 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop e124404ab5 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop c81490c68e - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity c7acf10796 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 172732b53d Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 82aab359be Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 19aaa9bd4e Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 314229d087 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop fc84ac4ce0 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 5396e6dc3d - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 3dedc0dcd4 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates d037f75e6c - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f5b4980ca7 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 65c85aa0df Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop f52eb64642 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 9ea3dafb87 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop f6cf066a29 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 7e8e448b99 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 38d1fc24f1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 66c6e9974d MAR10001-935: Payment updates 2 2421b27ff5 MAR10001-935: Payment updates 2 6bf387077a MAR10001-935: Payment updates 2 4e5e08104a - fixed renaming email templates for Order and Invoice notifications 619205b750 - Updated email templates with new style 737ea2f0be - Updated email templates with new style d7bf5f8068 MAR10001-880: Service points updates(fixed conflicts) c2a6083397 MAR10001-880: Service points updates 8ac4572927 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 7fb82d1f0e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 05648340d7 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 5ec1a6a54e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 21fea86fc7 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart a7dc47feeb - fixed identation in service definition of wfa rule registry 3e8649c6a0 - Fixed issue with WorkflowStartListener where only the last order id (whi…
- Loading branch information
