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
1999cc10e - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 7e9afaad3 Merge branch 'develop' into test 0019e8516 Merge branch '3.0' into test 053da4351 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 20b013feb Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test e6c6ba176 Merge branch '3.0' into develop 2a921f8bc - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications 91aed6a26 - Added migration to include organization id on the purchase order item 4e7ad22a5 - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig 7493d2d51 - removed .class parameters from service container and replaced it with the FQCNs 7382a658f - removed marello_product.entity.class parameter from service container and replaced it with the FQCN d679bd298 - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN d2e87f5a0 - Merged improvements for PDF capabilities - Updated entities with SalesChannelAwareInterface who were already had a 'getSalesChannel()' method available - Renamed the ChannelAwareInterface to SalesChannelAwareInterface for clarity and consistency - Renamed the old SalesChannelAwareInterface to SalesChannelsAwareInterface to indicate the differences in interfaces, this one will have functions to add, remove and get multiple SalesChannels instead of a single SalesChannel bbf61e119 - PSR2 CS fixes in PDF/InvoiceBundle c72351a60 merged branch 3.0 into feature/MAR10001-849 ac4723293 MAR10001-849: PDF Bundle improvements 84ddeebb2 - updated text-extended composer script to run a predefined phpcs.xml - updated packingslip datagrid to fix the issue with the warehouse filter and sorter - updated config yml files in order to fix the issue with API test failing a4b158042 - Updated ProductAttributeControllerTest to test the index but not the actual creation of the attributes, during issues with creating multiple fields - Enabled index test of the ShippingMethodConfigRule of the ShippingMethodConfigsRuleControllerTest as we forgot to enable it after debugging issue with the failed test, also removed debugging logs 3b4f87c44 - Fixed issue with entity classes defined in the service container instead of using the FQCN 27539a2ed - updated unique keys for certain entities in order to have both the schema's and annotations in line with each other - updated delete operation tests to use the FQCN instead of a service container parameter as entity class 1d50767a4 - Added missing translation labels 704e2f7bc - updated check if template is not null to be more strict in the EmailTemplateManager - updated SendProcessorTest with setting the correct exception when trying to find a localized template and there is no result 4d821e901 - Updated unit tests to use and test the new underlying structure of resizing images f21174495 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method 976f6bd94 - fixed OrderExtensionTest since the OrderItemStatuses have become enum's which are hard to mock during the nature of enums being extended entities, overcoming the issue by creating a stub class which will allow us to mock the class 03c2e3057 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated 259787bfc - Added phpcs.xml file for removing multiple arguments from commandline when running phpcs - updated dev.json to use new arguments when testing psr - fixed last CS of PSR2 since ORM data migrations are now being included in the config b4b1e20ff - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories 65daa404e - 65% done on PSR2 PHPCS fixes - updated command that will execute the PSR check to exclude migrations and test directories - [WIP]: add phpcs.xml to root directory for a more clean configuration instead of stuffing the command line with .... 72e67d496 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns c2d088017 - merged updated inventory batch layout and moved some widgets around - updated data migrations of shipping/payment integrations because of the removal of the entity parameter classes of Oro 403f7d82f Merge branch 'feature/MAR10001-837' into 3.0 139c38dfc MAR10001-847: Fix prices in product datagrid 6d8be00d0 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' 185d34b24 Merge branch 'feature/MAR10001-845' into 3.0 bcd1cac31 MAR10001-837: Inventory batch layout 2c9235aed - Added schema installer for ServicePointBundle - Updated installer of invoice bundle during installation errors on Postgres - Reverted changes made on Product datagrid during not showing products on the product grid c834a8ab7 MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener b6cd772dd - updated navigation items by swapping facilities and servicepoints in the menu - removed the height of business hours override td table in favor of restoring the height in the workflow display in page titles where applicable - added quick product navigation to purchase order item grid 2595ee11e Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 7ae8042af - removed empty line from services.yml ce975e1e4 Merge branch 'feature/MAR10001-842' into 3.0 cb30cc441 - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 97faf3a6a Merge branch 'feature/MAR10001-776' into 3.0 026b5ed30 Merge branch 'feature/MAR10001-776' into 3.0 c21d40af7 MAR10001-776: Inventory Batches - fixed bug in replenishment 4531bc1f6 - added composer.lock 4487e16f3 - preparations for release 9c7ebb089 - preparations for release 1f7345af5 - preparations for release 2819c3c30 Merge branch 'feature/MAR10001-776' into 3.0 9c4bb6a27 Merge branch 'feature/MAR10001-776' into 3.0 49cb95939 Merge branch 'feature/MAR10001-776' into 3.0 928594e30 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 37cd32a84 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched e191aafb4 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 4db583582 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 93bc2e239 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 1fee5e261 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 7956cf253 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs ca6f502a5 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 13612475f MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 8a50d6ae6 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 9967a85a7 [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log df1cb7464 [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log 4ea003c01 [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log 5be051dd3 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid 0bb927d39 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid 9d20701b2 - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge ce37a6112 - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge 94e6f5587 - updated InventoryBatchCollection options to `allow_add` and ensure users are able to manually add batches - Added an add InventoryBatch button to the bottom of the InventoryBatchCollection 944a0499c - updated InventoryBatchCollection options to `allow_add` and ensure users are able to manually add batches - Added an add InventoryBatch button to the bottom of the InventoryBatchCollection 12b60eba1 - fixed issue with InventoryManager and InventoryLevelFixture where they used to initialize an InventoryItem with a warehouse, which is not necessary anymore - Added action button for enabling Inventory Batches via a button instead of having a checkbox in the form 666ab51f6 - fixed issue with InventoryManager and InventoryLevelFixture where they used to initialize an InventoryItem with a warehouse, which is not necessary anymore - Added action button for enabling Inventory Batches via a button instead of having a checkbox in the form 8ccaba9f6 - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property 5d6d3844a - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property 5b31fe9a8 - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property 7f77e9197 MAR10001-776: Inventory Batches - created Inventory Balance trigger in order to update balanced inventory - added manual creation of InventoryBatch on the inventory batch update page d52df0655 MAR10001-776: Inventory Batches - created Inventory Balance trigger in order to update balanced inventory - added manual creation of InventoryBatch on the inventory batch update page cf018838d - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity c42a3a418 - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity cc3cbaebc - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity 178037210 - Moved 'old' customerAddressMap template and placeholder from CustomerBundle to generic addressMap in the AddressBundle for reusability - Removed old template and placeholder of customerAddressMap - Servicepoints map now uses placeholder from the AddressBundle instead of embedded implementation 82bee64d5 - Moved 'old' customerAddressMap template and placeholder from CustomerBundle to generic addressMap in the AddressBundle for reusability - Removed old template and placeholder of customerAddressMap - Servicepoints map now uses placeholder from the AddressBundle instead of embedded implementation 078492453 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid fc8c4387e MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid a56959684 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 3ee315d59 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 02918fd66 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 eadf26e02 - updated invoice email attachment template to match the subject of the invoice notification email 653dd6fd1 - updated invoice email attachment template to match the subject of the invoice notification email f7fd44771 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 cc78cdad3 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 be4c9f2ae - updated SendEmailTemplateAttachmentAction with methods, properties and dependencies in order to make it work with 4.1-rc3 - updated template for invoice email to make it look like the original bae24cb56 - updated SendEmailTemplateAttachmentAction with methods, properties and dependencies in order to make it work with 4.1-rc3 - updated template for invoice email to make it look like the original 6392d133a - updated pdf labels and headers for invoice lines in pdf - added some css tweaks to pdf, smaller font size, line color changes - split the description in the invoice line item of pdf into productSku and productName and have separate columns for it in the pdf 66c0f54c9 - updated pdf labels and headers for invoice lines in pdf - added some css tweaks to pdf, smaller font size, line color changes - split the description in the invoice line item of pdf into productSku and productName and have separate columns for it in the pdf 02ebfdd35 - updated customer update view to correctly display name in the tab of the browser 3c50453ed - updated customer update view to correctly display name in the tab of the browser 3ea3e88c1 - removed old bundle of Servicepoints, Servicepoints are now a separate package a727ae292 - removed old bundle of Servicepoints, Servicepoints are now a separate package 44f4cf6e3 - added service points as new package - added docker-compose file for service points application a79cd78f4 - added service points as new package - added docker-compose file for service points application dade4f5e3 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 4412c5601 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices cb5eb34f3 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 2eb5b91dc - fixed js component for purchase orders - fixed issue with showing currency symbol and prices a0a9af782 - fix controller - fix view 284cff7f4 - fix controller - fix view b02106eb7 - fixed create return button on order view page after the status of items have been changed to enums instead of strings e349ca4ee - fixed create return button on order view page after the status of items have been changed to enums instead of strings 576071659 - fixed order of import for multiple entity.js of purchase order d0b13e21b - fixed order of import for multiple entity.js of purchase order 7a5a1caa0 - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 2cc838df3 - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 1d523cffc - reworked the multiple entities setup for purchase orders regarding js components deeb6eb62 - reworked the multiple entities setup for purchase orders regarding js components 7286d3fd8 - fixed typo in item view of purchase orders 4cba9e4ab - fixed typo in item view of purchase orders cdd73bc3a CRH19001-18; Change date formtype 5d2a982b6 CRH19001-18; Change date formtype 6b3b24e03 CRH19001-18; Refactor form handler for business hours overrides 23f871f7b CRH19001-18; Refactor form handler for business hours overrides 59e718e52 - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 3bd28bf9e - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 03059ddff CRH19001-18; Fix business hours overrides datagrid 4e7b92b28 CRH19001-18; Fix business hours overrides datagrid 2f04f513b - fixed issue with logo showing X as image when no image is found in the invoice - updated check, to check against the common parent of the Invoice & Creditmemo, the AbstractInvoice to make it work for both Invoice and Creditmemo bb9c7a7c8 - fixed issue with logo showing X as image when no image is found in the invoice - updated check, to check against the common parent of the Invoice & Creditmemo, the AbstractInvoice to make it work for both Invoice and Creditmemo 5f4973652 - fixed adding return items to return when creating it from the datagrid, status is now an enum and needs the id as identifier for checking the status instead of the object - make the the business rule mananager service public in order to use it in the process of authorizing the return items b37f81d7a - fixed adding return items to return when creating it from the datagrid, status is now an enum and needs the id as identifier for checking the status instead of the object - make the the business rule mananager service public in order to use it in the process of authorizing the return items dc05e390f - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 6041ea2c0 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 5e3ed72c5 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 59dfd625a Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 66777f0da - updated emailtemplate action to comply with php 7.2.x 316f99b67 - updated emailtemplate action to comply with php 7.2.x 2365984dc - make service public in order to use the service within symfony 4.4.x framework on other places ebc1ae9ef - make service public in order to use the service within symfony 4.4.x framework on other places 310222f69 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 192df4cb8 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 a88d455e1 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 a8659a27c Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 99b600615 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 7c0f196f7 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 8d4dee8de merged branch 3.0 into feature/MAR10001-776 9bd950cc3 merged branch 3.0 into feature/MAR10001-776 a1a938d99 merged branch 3.0 into feature/MAR10001-776 595bc3a20 MAR10001-776: InventoryBatches b27a9ae8c MAR10001-776: InventoryBatches 19b0a4aa8 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 6e60193a9 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 5733ea805 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 7b5245e71 Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 20233da2c Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 eb894e455 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 9b442c953 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 905110932 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 efee8011c CRH19001-18; Add business hours overrides 923142625 CRH19001-18; Add business hours overrides e94354bbc - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription b7db90238 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 9620c2ec6 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription bfa5931f9 CRH19001-18; Manage collections of business hours in form handler 231bb0e94 CRH19001-18; Manage collections of business hours in form handler e6b9a080c CRH19001-18; Always show all days in form b380c5ad4 CRH19001-18; Always show all days in form 1f3e58698 CRH19001-18; Fix validation 506badde8 CRH19001-18; Fix validation 23ad02620 - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products 9d6bad5c8 - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products 438cd4074 - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products 6051c0692 CRH19001-18; Rewrite business hours datastructure [WIP] 9c20c1588 CRH19001-18; Rewrite business hours datastructure [WIP] 9be307c6c CRH19001-18; Rewrite business hours datastructure [WIP] 1fabb3439 CRH19001-18; Rewrite business hours datastructure [WIP] 0fde8de36 CRH19001-18; Rewrite business hours datastructure [WIP] 6f40bb129 CRH19001-18; Rewrite business hours datastructure [WIP] 4bb000f02 - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings f0fd1db5e CRH19001-18; Update form view for business hours c8b5fe623 CRH19001-18; Update form view for business hours 38575d13d CRH1900-18; Fix validation 2da004692 CRH1900-18; Fix validation f25a67557 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 3bac8acd8 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 682c99c9d CRH19001-18; Updates to form theme 95c9fdc18 CRH19001-18; Updates to form theme 4b9c8c683 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation b53c39a0a - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 28daddedd - updated dev.lock file fe90bbaa2 - updated all Marello CE bundles with the new format for webpack 5193d734f - updated all Marello CE bundles with the new format for webpack 604d4d97b CRH19001-18; Fix view page when no image selected 5cd88e9dd CRH19001-18; Fix view page when no image selected f6da13472 - updated Product related js components to comply with new webpack setup - Updated EmailTemplateManager for getting the localized email template were the old method has been removed c252f838e - updated Product related js components to comply with new webpack setup - Updated EmailTemplateManager for getting the localized email template were the old method has been removed 31156333b - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 227d2865f - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 3fa848d95 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 83969e824 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 669d346e0 CRH19001-18; Add custom form theme for service point business hours 75290c1b1 CRH19001-18; Add custom form theme for service point business hours d6bb3b9b1 MAR10001-776: Inventory Batches - new comments fixed 6200983d2 MAR10001-776: Inventory Batches - new comments fixed 924d920e1 MAR10001-776: Inventory Batches - new comments fixed 4f8d33afc CRH19001-18; Fix timezones of TimePeriod entities 0cbb51dec CRH19001-18; Fix timezones of TimePeriod entities 1e5841ce9 MAR10001-805: Error exporting inventory (and 'Download data template') - Error exporting inventory (and 'Download data template') - Change default text 'Oro' to 'Marello' in email Sender Name b6c984d5d MAR10001-805: Error exporting inventory (and 'Download data template') - Error exporting inventory (and 'Download data template') - Change default text 'Oro' to 'Marello' in email Sender Name b5d0795ce MAR10001-742; Add ability to add attachments to notifications from workflow action 6eb9d1569 MAR10001-742; Add ability to add attachments to notifications from workflow action 737fc682d MAR10001-742; Add ability to add attachments to notifications via SendProcessor 3c9be9991 MAR10001-742; Add ability to add attachments to notifications via SendProcessor 10b411531 MAR10001-742; Add attachments to Notification 6bc8305a6 MAR10001-742; Add attachments to Notification e4479f701 MAR10001-742; Add v1_0 migration for NotificationBundle a5dff3ee3 MAR10001-742; Add v1_0 migration for NotificationBundle 0ec555db6 MAR10001-742; Fix typo 8fa0f8f00 MAR10001-742; Fix typo 78454b743 - reverted to old sticky note icon 6525fe1e0 - reverted to old sticky note icon 9c7cff9d3 - changed the sticky note text - reverted commmented line in phpunit.xml 25ed67191 - changed the sticky note text - reverted commmented line in phpunit.xml a5d99b495 - fixed the sticky note description and logo - updated help link on the question icon on the top 106395942 - fixed the sticky note description and logo - updated help link on the question icon on the top 87cc5f9b7 MAR10001-13; Add white background color to PDF template c5ddc1a7e MAR10001-13; Add white background color to PDF template 895b6a11c MAR10001-13; Add configuration button on sales channel view f4f6289f4 MAR10001-13; Add configuration button on sales channel view 27c15c12d CRH19001-18; Validate timeperiod validity 598944c8e CRH19001-18; Validate timeperiod validity 8dc19290d CRH19001-18; Allow multiple timeperiods per day df4565703 CRH19001-18; Allow multiple timeperiods per day 7bdd0349d - remove instore assistant bundle as we are going to move the code to a separate repo and introduce it as an extension 985343a46 MAR10001-774: Remove increase / decrease external warehouses option 8c74043b3 MAR10001-774: Remove increase / decrease external warehouses option 740c4e7a1 MAR10001-774: Remove increase / decrease external warehouses option c4b99caec - CS fix 3c68ee563 - CS fix 58962e2b5 Merge branch 'feature/MAR10001-765' into 3.0 05cd663b2 Merge branch 'feature/MAR10001-765' into 3.0 1294fd60d Merge branch 'feature/MAR10001-765' into 3.0 83a15435f Merge branch '3.0' into feature/MAR10001-776 32dd31b4b Merge branch '3.0' into feature/MAR10001-776 3164fd5e1 Merge branch '3.0' into feature/MAR10001-776 b0a779dde MAR10001-802: WFA rule index is not rendering 0991d23c1 MAR10001-802: WFA rule index is not rendering 4766df7ec MAR10001-802: WFA rule index is not rendering 763b003ce MAR10001-765: Update InventoryRebalance Command e88a5d820 MAR10001-765: Update InventoryRebalance Command e9ec53480 MAR10001-765: Update InventoryRebalance Command 26a7c3c84 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 235ebf9e9 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ ae3bb88eb - updated to 4.1-beta on marello-ce b6326501a MAR10001-776: Inventory Batches - bug fixed a8b947cfa MAR10001-776: Inventory Batches - bug fixed a21503972 MAR10001-776: Inventory Batches - bug fixed 2a7b9beb8 MAR10001-776: Inventory Batches - bug fixed 690e5d913 MAR10001-776: Inventory Batches - bug fixed 76518c5c6 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order fe1066805 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 05feb9490 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 46c7b18ce - Added more fixes regarding the changed DI in the Controller as the service locator is more limited than the 'normal' one - Aliased classes to service ids in order to get the subscribed services correctly in the Controller dd2603baf - Added more fixes regarding the changed DI in the Controller as the service locator is more limited than the 'normal' one - Aliased classes to service ids in order to get the subscribed services correctly in the Controller c51753d46 - Added OrderDashboardController as a service tagged with the container.service_subscriber in order to fix issues with private dependencies instead of using regular DI - Fixed issue with private service which provides data to a dashboard widget cae7edad7 - Added OrderDashboardController as a service tagged with the container.service_subscriber in order to fix issues with private dependencies instead of using regular DI - Fixed issue with private service which provides data to a dashboard widget 7f394a308 Merge branch 'feature/MAR10001-770' into 3.0 d1b98eb90 Merge branch 'feature/MAR10001-770' into 3.0 dcb7aa4a4 Merge branch 'feature/MAR10001-775' into maintenance/2.2 9fe1a4e14 Merge branch 'feature/MAR10001-775' into 3.0 cd9313e3c Merge branch 'feature/MAR10001-775' into 3.0 619e6fd78 Merge branch 'feature/MAR10001-769' into 3.0 d4a649819 Merge branch 'feature/MAR10001-769' into 3.0 02a53141e Merge branch 'feature/MAR10001-769' into 3.0 d14bcb338 - updated dev.lock with Oro Platform beta 4.1 217d280ea - updated dev.lock with Oro Platform beta 4.1 30ef262ad - updated dev.lock with Oro Platform beta 4.1 6fa5a778a MAR10001-776: Inventory Batches - removed temp code 917cdc829 MAR10001-776: Inventory Batches - removed temp code b95c8380c MAR10001-776: Inventory Batches 40019aaf9 MAR10001-776: Inventory Batches e6e150fc7 MAR10001-776: Inventory Batches 0647a3566 - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids a484d5598 - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids 86e648a01 - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally c22d03f9a - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally 63a48116c - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally 13dcc1f9d - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container 0fb3f43b4 - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 467677402 Merge branch '3.0' into feature/MAR10001-770 6fccd993c Merge branch '3.0' into feature/MAR10001-770 f421f1d23 fixed bug on order create page 21589a0bd fixed bug on order create page 90dc5f64c MAR10001-770: Order statistics widget: filter by SalesChannel 1ff5a6164 MAR10001-770: Order statistics widget: filter by SalesChannel cf4217608 - Added migration to include organization id on the purchase order item 68f88547c - Added data column to PurchaseOrder f543a3824 MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 10cafed1c MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 098bc5146 Merge branch 'develop' into feature/MAR10001-769 a34c4d6af Merge branch 'develop' into feature/MAR10001-769 41e354923 Merge branch 'feature/MAR10001-758' into develop ae693ab4c Merge branch 'feature/MAR10001-758' into develop d60f3a7f3 Merge branch 'feature/MAR10001-758' into maintenance/2.2 9f2cf4c54 - CS fixes 2ab467421 - CS fixes 0ef03ef55 - updated branch aliases f8049b093 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 5f1757ce5 - CS fixes - Changed php version back to 7.1 face93ac8 CRH19001-18; Add API 92722bccf CRH19001-18; Add API b832b1717 CRH19001-18; Add map to service point view page 02939ef0b CRH19001-18; Add map to service point view page 23e5e4e6c CRH19001-18; Add service point image to view 4eadfa473 CRH19001-18; Add service point image to view 8416988bc CRH19001-18; Add EntityConfig 9c1030a21 CRH19001-18; Add EntityConfig 5033f1ccd CRH19001-18; Add ACL 3ca3135f4 CRH19001-18; Add ACL 6d9054f9a CRH19001-18; Add controllers and views 0cfb53c59 CRH19001-18; Add controllers and views a34157713 - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container c0cb485b9 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels ceaf461e2 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 4aa5ba4b5 Merge branch 'develop' into feature/MAR10001-758 4e9b55324 Merge branch 'develop' into feature/MAR10001-758 afa0bbcfc MAR10001-769: Show 'Cost' currency on de Product edit page 62c11fd93 MAR10001-769: Show 'Cost' currency on de Product edit page 79ae658dc CRH19001-18; Add Forms 3e78149c1 CRH19001-18; Add Forms b9c3c3257 CRH19001-18; Add validation b630b8cd7 CRH19001-18; Add validation 2d4e1ff7a CRH19001-18; Add translations 07a769e0f CRH19001-18; Add translations 7e32b8dfb CRH19001-18; Add data model 292a8e349 CRH19001-18; Add data model 763fa3517 CRH19001-18; Add ServicePointBundle 15a36f12b CRH19001-18; Add ServicePointBundle 01a0d5ae6 - removed self.version from package composer.json files 50883c5da - Changed column source on invoice and creditmemo items product sku and name d337d0963 Merge branch 'feature/MAR10001-674' into develop e7dae6c0e - Disabled OrderOnDemand widget in Inventory view / update in order to prevent the usage of the unfinished feauture 6b78c8848 Merge branch 'feature/MAR10001-674' into develop eab1858f1 Merge branch 'bugfix/MAR10001-764-stop-override-orderitem-status-when-already-set' into develop 104c43817 - Added check to prevent overriding OrderItemStatus when already set on creation fe8bb42ba Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop 1c6d80544 - Added additional check to verify there is a product to get the inventory item from when passed back to the import processor 97c9b2fcc - Added additional check to inventory level update strategy to check wether the product of the 'associated' inventory level exists before importing and throwing errors e48fc472c removed useless fields from oro_entity_config_field 465492e30 removed useless fields from oro_entity_config_field 9a7010469 fixed bug in Migrations versions 813bbd944 fixed bug in Migrations versions 53ebeb0e7 fixed bug in Migrations versions 3eb689333 fixed bug in Migrations versions 3affb539f fixed bug in OrderBundle migration 5812d0894 fixed bug in OrderBundle migration 24fdddaa0 merged branch develop into 3.0 e043d4722 merged branch develop into 3.0 f84c3c90c merged branch develop into 3.0 fe06756a9 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop 154bd1592 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 4c66dac97 Merge branch 'task/MAR10001-add-orocommerce' into develop add2b43cc merge branch 3.0 into feature/MAR10001-730 05e8bf957 merge branch 3.0 into feature/MAR10001-730 17b92a3dc merge branch 3.0 into feature/MAR10001-730 864b93968 merge branch 3.0 into feature/MAR10001-730 1cce30b4a merge branch 3.0 into feature/MAR10001-714 0b8bdb496 merge branch 3.0 into feature/MAR10001-714 5b9024db8 merge branch 3.0 into feature/MAR10001-714 b75c1ed00 merge branch 3.0 into feature/MAR10001-714 c462f187e MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bug in migrations in InventoryBundle related to renaming column from system to is_system 4c9b5b4bc MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bug in migrations in InventoryBundle related to renaming column from system to is_system ca97bfc4e Merge branch '3.0' into feature/MAR10001-725 09421c85e Merge branch '3.0' into feature/MAR10001-725 ceeafb61f Merge branch '3.0' into feature/MAR10001-725 931f1932c Merge pull request #16 from marellocommerce/feature/MAR10001-751 989b3f2c9 Merge pull request #16 from marellocommerce/feature/MAR10001-751 56e5d5d61 Merge branch '3.0' into feature/MAR10001-718 8a15bf5a1 Merge branch '3.0' into feature/MAR10001-718 c790edaa0 - finetuned composer json files for oro commerce 4ddc0c617 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 6f402e9ca - updated PurchaseOrderBundle schema versions to take the 'next' version of Marello (2.2) into account 6c6ae2d34 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop df0124130 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 52a78660f - Added Organization ownership to ReplenishmentOrderItem - Added migration to update current ReplenishmentOrderItems - Added translation for Organization label - Updated installer migration to include Organization column 7c1ba3419 - CS fix dd6a7b011 - Added Organization ownership to PurchaseOrderItem - Added translation for Organization label on PurchaseOrderItem - Added migration to update current PurchaseOrderItem with Organization - Added migration to add column for ownership to PurchaseOrderItem table - Added translation for Organization label on ReturnItem e53eefe14 - Added translations for Return item and Refund item organization labels - Added Organization ownership to RefundItem - Added migrations to update current RefundItems with Organization - Added migrations to add ogranization colum to RefundItem table 0fb228023 - Added migration for updating existing InvoiceItems with Organization - Added migration for adding ownership to ReturnItems - Added migration for updating existing ReturnItems with Organization 92e27ecf5 MAR10001-751: Rename columns to bbdd49b9e MAR10001-751: Rename columns to 893c103da MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs a50481065 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs 1491c5475 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle f439b84c9 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle 8612c07ae merge develop branch into feature/MAR10001-717 ' a885563af merge develop branch into feature/MAR10001-717 ' eb6dc9d3e merge develop branch into feature/MAR10001-717 ' 84443da43 merge develop branch into feature/MAR10001-717 ' 4fabaabf6 - Added migration to update current credit/invoice items with organization based on the parent entity's organization 7a30b978e MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 2c93997a1 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels fd600cf5e - updated PackingSlipItem test to include organization - Added translation for PackingSlipItem organization 86a679149 - Added migrations for updating current OrderItems & PackingSlipItems to set the organization based of their parent entity - Added Ownership config to PackingSlipItem - Added migration to add the new organization column on PackingSlipItem c45b7e495 - Added ownership field to Oro config 938fcb2e5 - Added organization ownership to InvoiceItems - Added translations for organization - Added migration to update schema with organization 2e7dcce2f - Added organization ownership to OrderItem for applying ACL when reports are created with the items 03055ef1f - Added Organization ownership to Supplier entity - Added test to verify the organization is set when a new supplier is being created cd439fbfd MAR10001-674: Order on demand - updated OOD validator - fixed bugs in order items statuses changing eccc3fc5c - updated rendering of OrderNumber link and SalesChannel link on various views for quick navigation - added quick navigation link to customer on Invoice view ee1c715a1 - Added product sku rendering link to RefundItem's datagrid for quick navigation 9b77d2459 - Added product SKU rendering link to ReturnItems grid for quick navigation b8a832823 - Added product sku rendering link to PackingSlip item grid for quick navigation ace617480 - Added product sku link rendering to Invoice Item grid for quick navigation a327b1fdb - Added product sku link rendering to order item's product in order item datagrid 2d2303bf7 - Added quick navigation rendering link for product SKU's as macro and template for Twig templates - Added quick navigation product sku link to datagrids of Inventory related datagrids - Updated rendering product sku link in inventory view pages - Updated rendering product sku link in order's hero widget 0e2cbe4f4 - Updated rendering of orderNumber in datagrid to check ACL access and handle rendering of both an id and object of order - Added rendering a view link to latest order grid in dashboard widget for quick navigation 048587cf3 - Added quick navigation for customer on Order View - Updated quick navigation for SalesChannel link on Order View 4ba6fd268 MAR10001-714: Payment methods 54f3f9f07 MAR10001-714: Payment methods 38f1adb17 MAR10001-714: Payment methods 6c1fc09a5 merge develop branch into feature/MAR10001-714 54fe24b3f Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 7c2e68e36 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 9c966430d Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 4b750e19c Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 9c172db5e - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 0f8d89e19 MAR10001-742; Add tests 40c061fa7 MAR10001-742; Add tests f8d1a0d3f MAR10001-742; Check if invoice workflow transition is set e455f1228 MAR10001-742; Check if invoice workflow transition is set 8ea852060 MAR10001-742; Remove debug code 30fd7e03c MAR10001-742; Remove debug code 9e774ebfe MAR10001-742; Add workflow actions to send invoice e-mail 503189527 MAR10001-742; Add workflow actions to send invoice e-mail df25693a0 MAR10001-742; Add translation e953097f1 MAR10001-742; Add translation de8382e18 MAR10001-742; Add migration for invoice e-mail template e9bbb0e1d MAR10001-742; Add migration for invoice e-mail template 5e73fe3fb MAR10001-742; Add IsSendEmailTransition workflow condition 3b99d8921 MAR10001-742; Add IsSendEmailTransition workflow condition 123c0434e merged develop branch into feature/MAR10001-714 branch 29bbcad6c merged develop branch into feature/MAR10001-714 branch f4a48dc3d merged develop branch into feature/MAR10001-714 branch fea788d98 merged develop branch into feature/MAR10001-714 branch 716f69fe1 - Reverted changes that break BC, added comments where BC would break if we would keep the changes in the Interface - Added alternatives to provide same functionality but without BC breaks b7c081cb7 - Reverted changes that break BC, added comments where BC would break if we would keep the changes in the Interface - Added alternatives to provide same functionality but without BC breaks 9083c16e5 Merge branch 'develop' into feature/MAR10001-674 42ffd497d - CS fix -> fixed docblock ee037a4d4 Merge branch 'feature/MAR10001-739_Payment-term-invoice' into develop 7798de002 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 50f910317 - Added Migrations to update entity_config tables and entity_config_field tables to set auditable to false for InventoryLevel && BalancedInventoryLevel ebd6baf56 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 5e3dcf58b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 437eb0df5 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow c26c4cd0a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow efd9a82bf Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow c0256e204 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 7fb05b270 - removed the trigger of a rebalance when installing to reduce additional messages in queue - refactored the trigger of rebalancing when a SalesChannelGroups are created or deleted to only rebalance products linked to those SalesChannelGroups a546cf3f4 - Added check to prevent sorting on null when no products have been found and linked to any warehouse when creating order and moving through the workflow dc861c587 MAR10001-742; Add e-mail settings about sending invoices ec63c7a76 MAR10001-742; Add e-mail settings about sending invoices 041ed21c0 MAR10001-739; Fix migration namespace 3fad78266 - CS Fixes ce2722b62 - CS Fixes 8696b07e4 Merge branch 'feature/MAR10001-674' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-674 d37f12418 MAR10001-674: Order on Demand - fixed warehouses calculations for order fc82a7356 MAR10001-674: Order on Demand - fixed warehouses calculations for order 663149607 - remove unused code from validator e705e58d5 - Removed unused code - Added CS fixes where necessary 756dcea67 MAR10001-674: Order on Demand 23e5e6f89 MAR10001-674: Order on Demand 7e9bb647f MAR10001-674: Order on Demand 3d3bcc350 MAR10001-674: Order on Demand f4683f553 - Updated dev.lock files - Updated oro platform to version 3.1.13 bb5212522 - Updated dev.lock files - Updated oro platform to version 3.1.13 cd1c5f2b0 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 3d17b9064 backmerged develop branch into feature/MAR10001-730 branch 4b57cc36f backmerged develop branch into feature/MAR10001-730 branch 35f2109cc backmerged develop branch into feature/MAR10001-730 branch 608d7956e backmerged develop branch into feature/MAR10001-730 branch f4cc70c09 MAR10001-730: Update CustomerBundle with Customer 80d05c795 MAR10001-730: Update CustomerBundle with Customer 2ca867546 MAR10001-730: Update CustomerBundle with Customer ab4959178 MAR10001-742; Add workflow action to send email with attachment 551422af0 MAR10001-742; Add workflow action to send email with attachment e796ca95c MAR10001-739; Add payment term to invoice view 00e5addd2 MAR10001-739; Calculate invoice due date b68195820 MAR10001-739; Add payment term during invoice generation 376b14521 MAR10001-739; Add getCustomerPaymentTerm to PaymentTermProvider d5f0ff2f9 MAR10001-739; Add payment term to invoice model bbe4f4e27 - platform update 827a74d3d - platform update 58c6d1bb6 MAR10001-13; Add demo data for invoice configuration 86867d3bf MAR10001-13; Add demo data for invoice configuration 9daa545b8 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop e46245ea7 - Fixed typo in class name 4f7dad1f6 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop 91ab98143 - Small CS fixes; new line on end of file, formatting ano function over multiple lines bfcf14bd3 MAR10001-730: Move Customer 17ec80ebc MAR10001-730: Move Customer 55d1c48fc MAR10001-13; Add functional test 197e7ae69 MAR10001-13; Add functional test 1391e4d93 MAR10001-13; Update TableSizeProviderTest 5b3449ea7 MAR10001-13; Update TableSizeProviderTest 56e0d3d01 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 1fcaceed5 Squashed 'applications/marello-application-ee/' changes from d13f2b41e..a69ba4abb 8fd056727 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 6c8f2edc5 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 67e652aa8 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 52931de98 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3bb3068a2 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 73de19e5f Squashed 'applications/marello-application/' changes from 3d023f800..3a5a0ae59 3a5a0ae59 Update OroRequirements check to be compatible with Oro Platform 3.1.x 341f1346e - Updated demo data for PO in order to make sure there are actually POitem candiates for creating a PO 69b6d44df - Added test to verify correct registration of cron command - updated code to include correct registration of cron command b5f0b28d7 MAR10001-13; PdfBundle unit tests d42a9ea89 MAR10001-13; PdfBundle unit tests d32de0e5c MAR10001-13; Fix PDF bugs b13f6ec40 MAR10001-13; Fix PDF bugs e2078a5d3 - Updated tests to cover ProductRepository getPoItemCandidates - Updated inventory data fixture for tests to include data for InventoryItems - Added test for cron command to verify sending the notification for PO advise - Updated ProductData fixture to set a preferedsupplier on a product 5057b5dba Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 5aa5e00f1 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 264e42ee4 - Added test to verify the working of the saving of the notification as activity target b4379a611 - updated phpdocblock removing parameter that isn't there anymore 3cb6d4388 - updated query for including purchaseInventory when selecting purchaseOrderItemCandidates 8a2d6dea1 - Updated SendProcessor to keep BC by having a setter and property for saving the notification as activity instead of adding a method parameter - Updated POACommand to set the property on the SendProcessor and use a constant as exit code 35f19c20c Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification bede0276e Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 3e665b14d Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 24c7cd59f Merge branch 'develop' into feature/MAR10001-725 0de46972c Merge branch 'develop' into feature/MAR10001-725 4d3d9e317 Merge branch 'develop' into feature/MAR10001-725 ddbba0501 Merge branch 'develop' into feature/MAR10001-725 52c04f91b Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification eb83373e3 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 0771a6260 MAR10001-13; Add PDF button to invoice view a8b976bd0 MAR10001-13; Add PDF button to invoice view b3dd7d229 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 286638244 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 17f278515 MAR10001-725: Update ProductBundle 4442a0209 MAR10001-725: Update ProductBundle c38c2ba89 MAR10001-725: Update ProductBundle a093e74d5 MAR10001-744; PaymentTerm API tests d6eebd000 Merge branch 'feature/MAR10001-735-add-second-workflow' into develop f3c4e586b - Added an Interface to have some constants for order workflow names - Updated tests being more clean without the much duplicated code d9e9b7ac1 MAR10001-744; Adjust tests for Company PaymentTerm a38ce3001 MAR10001-744; Add PaymentTerm API d402c756a MAR10001-744; Add payment term to Company view and form 2590eddfb MAR10001-744; Add test for PaymentTermSelectType 754cc9a3d MAR10001-744; Add PaymentTermSelectType 95a00873f - Updated logic for moving default worfklows to pending when only one is active - Added test for logic to test scenario's where there is only a single one available, the entity not being eligible or when there is more than one available - Added tests to interact with default installation 0d3126a61 MAR10001-744; Add payment term to Company model a329c447b - Added first version of the OrderWorkflowStartListener for when a single workflow is active on the order and start it automatically e59e9b338 - Fix inventory level tests for CE version 634e09c8d Merge branch 'task/MAR10001-0-fix-inventory-level-functional-tests' into develop 314adb7ee - Added warehouseLocation to InventoryLevel form fields 22b572a3b - updated type hint for getWarehouseLocation() in InventoryLevel - Updated datagrid of inventory level to include warehouseLocation - Updated inventory level collection form to include warehouseLocation 4184fa6bd - added warehouseLocation to inventory level form type 3699d44e1 - Added Warehouselocation to InventoryLevel - Updated migrations to include warehouse location column - Added translation for new field warehouse location - Updated function/unit tests to test setting/getting and updating warehouse location 783e12d1f - Fix inventory level tests for CE version c4cb25498 - Fix inventory level tests for CE version e18bc681b - added currency of root entity(Invoice) for formatting correctly in PDF's f93f7750f - added currency of root entity(Invoice) for formatting correctly in PDF's 4c6ea2d12 Merge branch 'feature/MAR10001-701_Payment-term' into develop 5d534a859 - Fixed check in PaymentTermDeletePermissionProvider to take into account a null result from the PaymentTermProvider - Fixed PaymentTermControllerTest to count the result of the loaded fixture and verify 'results' d23d027e4 - Show inventory level collection when empty for CE version 0a3cd1041 - Adding PaymentTerm demo data - Updated payment term provider to check wether the id from the config exists before querying on the repository ffb78a397 - CS fixes db013471c - removed unsued and duplicate class 37bfb8d47 Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 57b78f692 Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 9719849ac Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 bada48fe5 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 8a83a9d9e Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 498e2c90e Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs d004d1a4b Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 048ca9bcf Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs e7d8729f8 - updated lock files to have mpdf as dependency in lock files 13f02419a - updated lock files to have mpdf as dependency in lock files 883055c06 Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 48357abe8 MAR10001-718: Refactor LocaleBundle - backmerged develop branch c2b4a349b MAR10001-718: Refactor LocaleBundle - backmerged develop branch 19f681f6a MAR10001-717: Update applications with Oro platform 4.0.0 b4831a27b MAR10001-717: Update applications with Oro platform 4.0.0 e786173fd MAR10001-718: Refactor LocaleBundle ba992802e MAR10001-718: Refactor LocaleBundle ccddf39bc - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default 5ad9bcc47 MAR10001-717: Update applications with Oro platform 4.0.0 837111345 MAR10001-717: Update applications with Oro platform 4.0.0 4cab27945 MAR10001-717: Update applications with Oro platform 4.0.0 162e4a2e8 MAR10001-717: Update applications with Oro platform 4.0.0 c424e39c2 Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop 13543c6a5 - removed unused code - todo add additional customer controller tests for create/update 0d959d084 - removed commented code 09eb13a96 - fixed testCompanyUpdateRemoveCustomers test now calling correct method for customer to assert - removed an assertion from testCompanyUpdateRemoveCustomers because assumption of the assertion was wrong c8c93f122 - CS Fixes - Updated Company controller test to test saving a company without customers assigned - Fixed Customer entity to allow the company to be empty - Added Company name and view link to Order view 58b76bdb0 - CS fixes 0c7035e9b Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 deea8a109 - removed suppliers from product grid - added missing taxcode to product grid 0ac39ed58 Merge branch 'bugfix/MAR10001-711-images-load-slower-than-marello-20' into maintenance/2.1 fd8954fd9 - added addditional migration to update product images with `acl_protected` false in Entity config to change the caching directory of images - updated installer to include the `acl_protected` entity config by default in Product Image attachments 22b754da8 MAR10001-13; Add TableSizeProvider 7551ac4f9 MAR10001-13; Adjust template paper size to configuration abe50557f MAR10001-13; Add paper size configuration value 7481e5d9b MAR10001-13; Fix configuration validation 19d2f4cf4 - updated OrderView datagrid layouts to resemble the 'original' style from Oro 2a16c3e34 - remove lock files b53f12c7b - remove lock files from master 3637f5469 - Release preparation 2.1 68465c418 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 f92c46681 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 1e086d09e - updated branch aliases 2c7d9f62c - updated branch aliases 1899b4cc9 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 00235777d - updated version number in upgrade notes 8305828a8 - prepared composer.json files for release 93b344eb8 - prepared composer.json files for release 66943d23c - prepared composer.json files for release 45b8ab62c - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 6f02ef191 - Added twig file extension to deal with image id being fetched as a result in the product grid and getting the correct image during PostgreSQL having issue with an object in the result - Fixed subscription controller test to include cancelBeforeDuration field since it is not nullable 946e9f5ad MAR10001-13; Add template for invoice PDFs 52e93f598 MAR10001-13; Add InvoiceTableProvider b62251e0a MAR10001-13; Add PDF rendering helper libs a7d0a5c5a MAR10001-13; Add DocumentTableProviderPass 1a85d5761 MAR10001-13; Add get_document_tables() Twig function 71e130d39 MAR100001-13; Add DocumentTableProvider 3533f0c3e - added back sorters in to two datagrids for invoices and packingslips 3822f42fa - updated translations - updated updated orderitem status Dropshipped to Dropshipping - updated datagrids with removal of exports and some sorters 962e68cf9 - updated dev.lock files …
- Loading branch information