Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Order management #16

Open
Akshaynikhil-zz opened this issue Jan 13, 2021 · 0 comments
Open

Order management #16

Akshaynikhil-zz opened this issue Jan 13, 2021 · 0 comments

Comments

@Akshaynikhil-zz
Copy link

No description provided.

24198 added a commit that referenced this issue Apr 22, 2021
@24198
Squashed 'package/marello/' changes from 9051b1f..1999cc1
9586a6d 
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
…
24198 added a commit that referenced this issue Jan 12, 2022
@24198
Squashed 'package/marello/' changes from 73c2e39..d80705c
3b7bdd1 
d80705c83c Merge branch 'release/3.1'
b7df2ced63 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922'
9be5bc3877 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd'
0dcab9ced7 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's
9465afdc47 - fixed layout on payment popup on Invoice/Creditmemo
968dfcf75c - Added product unit as additional information to OrderItem on order create
29cd362aac - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow
e060f3794a - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages
2d0aee8f24 - added manage batches inventory link on inventory level grid on inventory item view
9e68b871b3 - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name
000dcf379c - Added taxIdentificationNumber below company number on invoice entity view
5a41136389 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop
6e84022f8d - Added small changes for batches; - added delivery date to batch form
e78d01e15f - Fixed issue with selecting organization when creating products and purchase order
debbd9f0db - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip
a8317801d2 - Added organization to query for finding a specific sku for an organization
5f4f0254d3 - removed old query reference
83badc9bf2 bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction
2bd300f915 - Added different calculation for total due on order view
287750fecb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid
4c6a058db5 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname
1e1a5486e6 Merge branch 'develop' into feature/MAR10001-930
dbc8defaa3 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver
ee01c68790 - added hasColumn() checks on fields that might already be added in previous version
1a3639e998 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf
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
01cf685ba1 - Added fix for query on postgresql where customer tax identification is copied to company tax identification
5ba6a0387a Merge branch 'develop' into feature/MAR10001-894
167914be40 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop
430ab3bb43 - Added minor fixes to purchase orders view and form
dde294954d - Added possibility to update cost via marello-supplier-product-grid
bd610c9fe6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0
dd1fc54c82 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0
193d3fea6f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0
3baa45e432 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0
668807adf4 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0
9a5de91019 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0
91d136e4c4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0
206a89b737 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop
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
96d3c3da5f - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider
497285847f - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data
afe10013b2 Merge branch 'develop' into feature/MAR10001-935
b80a45a604 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop
2a9faf61cd - added additional check before loading the purchase price in the Purchase Order Item
2b1ffd9160 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop
40d84ffe1d - Added support to display extended fields on SalesChannel view & grid
3396437ff1 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop
b943ecde6d - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration
4272c01b92 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop
8ea2cd21c2 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid
f409304860 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only'
42f96be742 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop
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
e9bdca05ad Merge branch 'bugfix/MAR10001-966-product-categories' into develop
b80ea4d666 - updated product category grid on the category view to take the localized value of product name into account
52ea970fdc Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop
68a34c4f05 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid
e997c2938b Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop
576d4b4f84 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string)
d455e77b8e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop
d47846ac55 - added default ACL config value for Tax Related entities
57e9233303 Merge branch 'task/MAR10001-0-layout-fixes' into develop
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
c59a474ba0 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop
69df3b84b5 - fix issue with trying to display data based on an entity that isn't available
635b95d3bd Merge branch 'task/MAR10001-0-skip-configurables-magento-integration'
78bff7f0ce - Added shipping method details to store additional information regarding the shipping method on the Marello Order
6a1f95564c Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop
cbc7d50021 - Added rendering for additional data block with dynamic entity fields
359e5f74ba Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop
3b49897071 - Added context option check for forceFlush in the inventorylevellogrecord
b256f6567d Merge branch 'task/MAR10001-0-validation-fixes' into develop
6e8fc2bac8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message
d3b061686c Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop
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'
4d029e0a1d Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop
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
dd4f67f6c9 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop
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
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...
1ba0c3e52a multiple fixes
5ccbb54a33 multiple fixes
6f34f88cbf Merge branch 'maintenance/3.0'
b48c0cc790 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0
e19f59023c Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0
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
00cc1f1002 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)
e03adedeaa Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop
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
8e3b617483 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
172732b53d Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop
314229d087 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
9ea3dafb87 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
2421b27ff5 MAR10001-935: Payment updates 2
4e5e08104a - fixed renaming email templates for Order and Invoice notifications
737ea2f0be - Updated email templates with new style
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
3e8649c6a0 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start
12028a44c2 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop
ebd3a4ee2f - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly
d4a4faec3e - added order status change for 'new' workflows in Marello
5f76351b57 Merge branch 'task/MAR10001-0-add-order-status' into develop
a2edc86b63 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation
afba749090 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop
1606b21a2f - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid
a032ac46b9 - split the SalesBundle migrations as v1_3 was already released...
8f45f4f4da Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0
c55e72c5b9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0
2e3c05c2ab Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0
42ab5e4e49 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop
e79f8ea1bd - renamed migrations to take newer versions of migrations into account on the develop branch
466e26f915 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop
616a370e64 - updated return notifications with ProductUnit on line items - added migration to update existing templates
cd12386aa2 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations
12edb4db24 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null
e0560e386f - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field
ddba1708e0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved
e1f528d5a2 - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper
c14755b41e - Added unitOfMeasurement to the InventoryItem view
67b17f04d3 - added unitOfMeasurement to InventoryItem grid with filters and sorters
c1c8675b6d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem)
3362d3e39b Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop
724c55a6a4 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address
b74710116b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle
8700025844 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop
34f464d5e0 Merge branch 'task/MAR10001-0-price-alignment' into develop
95890e1169 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop
fdc275034e Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0
5a601552df Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0
bd669d4e5c - Added the replenishment field to the variant grid for seeing continuation of the product
d67deb0175 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right
aaabab0bb2 - added validation message for DeliveryDate if date is not set in the future
8e7eaf7e1d - Added deliveryDate validation to make sure the date is set in the future and not in the past
3b22e634fa Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop
cd34253b36 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54)
e4636cbefc Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop
86acde5686 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop
abb022df84 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0
0bfbba2440 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress
8af7a756af - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection
1e8ba0254c - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned
764ded7fb5 - fixed unique constraints format...again :')
de1cf1ddcf Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop
a120078366 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400'
c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041
9529d24ca5 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0
d089cd443f - remove disabled code from SalesChannelType form type
a4a6ba91b2 Merge branch 'feature/magento2-integr' into testmerge-magentoint
b8e33d0c8f - removing BC break from order view regarding payments
2ab0e17cd5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet
c91a5a6ef2 MAR10001-931: Update Order and OrderItem entities with additional fields
49321bf5b1 Merge branch 'feature/MAR10001-931' into develop
a598e0492f - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet
dae77eb2c2 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0
adce2c73eb - fixed issue with checking companyNumber on null while trying to render the PDF template
b4aaca2a15 - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department
05b90c397a - fix OrderExtension test to include the new twig functions
676420e632 Merge branch 'feature/MAR10001-920' into develop
7c21b23895 MAR10001-931: Update Order and OrderItem entities with additional fields
594e0cb6f4 Merge branch 'maintenance/3.0' into develop
bde099601c - fixed issue with misquoting the columns on the unique constraint in the Company entity
9b975a725c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0
498af6f3de MAR10001-930: fixes for filtration on products grid
b1dac57f09 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form
2b455f4c3e Merge branch 'maintenance/3.0' into develop
67af315d08 - removed commit reference in validation file
06abfd1d3f Merge branch 'maintenance/3.0' into develop
5bacf821b9 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0
98738fb60e Merge branch 'feature/MAR10001-909' into develop
f0c0ac9f5d - renamed Company code to Company number - added pdf translation - moved company number on the PDF
0d171513d8 MAR10001-909: Add Company ID to Company
2e94a890c3 - renamed Company code to Company number - added pdf translation - moved company number on the PDF
c9ae8ff004 MM-25: Add logic for product prices and inventory synchronization (#50)
c71fba9cfb Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop
32f24758d1 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null
e042a219a8 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop
d2dec90d1e - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information
34bb0dd58f MAR10001-909: Add Company ID to Company
e8489d2fb9 Merge branch 'maintenance/3.0' into develop
177f7c0781 MAR10001-909: Add Company ID to Company
bf663180db Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0
440aa90b1d Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0
88e77d1529 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension
9c8e8076ba Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0
4ac8519a49 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0
bc363a6d7c - added missing validator translations regarding shipping method rules and configs
739457eee9 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file
511b6e95ed MM-13: Implement initial products export (#49)
99bce0c3bd Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0
27b7d0ba76 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop
0f282598df - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group
a24a263ce1 - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null
9be493eebb - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper
05c200e5f6 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager
e52f270e05 MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times
29637429e6 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service
dbd2f97b96 MM-23: Add logic to process changes in integration (#47)
a9d817e4f2 - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel
a0cbca0bad - removed required asterisk from Description on SalesChannel as this is not a required field
3c1a361456 - removed required asterisk from description as this is not required in the SCG
821b86b812 MAR10001-920: Payments Update
3b20f616b5 MM-22: Add logic to process changes in Sales Channel (#46)
0444679822 MAR10001-920: Payments Update
dcc2fabbd7 MM-8: Add logic for tax class dictionary synchronization (#45)
679b16e1b4 MAR10001-920: Payments updates
8f5ab0ba92 MAR10001-920: Payments updates
640b21f1b1 Merge branch 'feature/MAR10001-911' into develop
7e5614fad8 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail
73d2e6bb7f MM-6: Prepare logic for dictionary synchronization (#40)
0b932eced6 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0
a1fceaada0 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0
606a41d0a2 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail
e52e0f3e41 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist
6e88347657 - CS fixes
aeb67039fd MAR10001-911: Update Product with SKU and organization unique index
4437b85ee7 Merge branch 'feature/MAR10001-791' into release/3.1
faf4093a73 Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop
669afa36a2 - added entity_grid_all_view_label to all relevant entities on CE
32b5734247 MAR10001-911: added migrations
9e3545bc8c - updated pricing js views in order to be able to disable channelpricing without errors in the console
3aa0841106 - updated pricing js views in order to be able to disable channelpricing without errors in the console
685674d73a - added invoice type to the invoice/creditmemo view for clarification
9d2ae719b9 MM-4: Create Magento2 integration form - Added missed constraints
8e21fd8af5 - fixed issue with incorrect route names in the entity config of the AbstractInvoice entity which prevented users from using the entity management on Invoice related entities - fixed some of the confusing labels as creditmemo's were labled Invoice instead of Creditmemo
4bcba3217a - fixed functional of POcrons tests by updating the groupby clause in ProductRepository
80c43c3a94 MM-4: Create Magento2 integration form
5eb0c19071 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL
59c349e61e - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo
67409dbf06 Merge branch 'maintenance/3.0' into feature/MAR10001-870
ee18f241b3 - updated creditmemo/invoice pdf's with company from the customer address instead of the Company from the customer itself - updated the address widget to include the company from the address to display on different views like Order, Invoice etc..
dff415a0b0 - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's
afc9de31d1 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf
1688dde2fc - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver
f656b27a94 Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0
2b1c222a8d - Updated (balanced) inventory grids to have most of the same columns in the same order as the Product grid - Added additional checks for disabled products before balancing and checking saleschannels that are actually assigned to the saleschannelgroups that will be available for balancing - Added additional listeners for rebalancing and resetting the balancedinventory levels when ProductStatus is changed and Saleschannels are assigned or removed from the product
7e3d730b3f - Fixed inventory levels on inventory item view when having PostgreSQL as db driver
c697c71be1 Merge branch 'maintenance/3.0' into feature/MAR10001-870
9d776755be MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations
c25ace73f3 Merge branch 'maintenance/3.0' into feature/MAR10001-791
1c252cd57f MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce
e86e6ed294 - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates
f2f6e7a8d0 Merge branch 'release/3.0.1' into maintenance/3.0
973ae208d7 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1
49b655159b Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1
eddf9768aa Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1
f1e2b9c6dd Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1
889dbf4c36 - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders
9e37a13263 - CS fixe
80cb2c6d70 Merge branch 'maintenance/3.0' into feature/MAR10001-867
8f9aba150e Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1
a0c3ea4f15 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1
1d257e70a8 Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1
b3e08131b2 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1
2d66315948 - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it
2c96360025 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor
d9471fb432 fixed failed repository
e0acbed29c - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data
1cc8c922c8 - moved the image of the product view to separate template file in order try to control the divs better
7d5fa0dbcb - switch createdAt and tags columns in product grid using the buildAfter event
7010c4b2ab - added inline editing for product status in product grid
07a07d458a - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column
d4ec778e79 - added Product tags in entity config - added migration to enable product tags for existing products
fb1e74458a - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view
d44ec5ee16 - Added Additional data fields to Order entity - updated div's on the additional data of the product view
20dc7304f9 - updated migrations to deal with postgres update, works on mysql too
1ce83a7bd8 - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql
a03739881c - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views
13ec79d24a - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views
8f7a61c724 merged maintenance/3.0 branch into 3.0-test
16268f1b60 fixed problem with schema update
e3a455ee6d Merge branch 'feature/MAR10001-766' into feature/MAR10001-759
b2919ff4bc Merge branch 'feature/MAR10001-759'
02531ac825 made productName not audittable field
304eca194e MAR10001-867: Order statistics error when selecting 'All Time' as Date Range
b61fefe5be Merge branch '3.0' into feature/MAR10001-791
f7d47e4683 MAR10001-791: Marello Payments
a0a457bd4f - 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
062a9a134d - 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
d992deb85d Merge branch 'develop' into test
ccf2ad8602 Merge branch '3.0' into test
68f42ed7fc Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test
a9c51f6d9a Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test
6c1b25d467 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test
f41eaa1b3c Merge branch '3.0' into develop
501a3df713 - 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
6cc04c42c0 - Added migration to include organization id on the purchase order item
06e994633c - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig
3a6a510032 - removed .class parameters from service container and replaced it with the FQCNs
8109ecb47d - removed marello_product.entity.class parameter from service container and replaced it with the FQCN
7fc9dfaeda - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN
d12c41ce2b - 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
d41e71cce2 - PSR2 CS fixes in PDF/InvoiceBundle
50df90b043 merged branch 3.0 into feature/MAR10001-849
d0e321148f MAR10001-849: PDF Bundle improvements
15034da774 - 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
33e8f5c219 - 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
bf0029c11e - Fixed issue with entity classes defined in the service container instead of using the FQCN
b405a9a300 - 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
47ee1f552a - Added missing translation labels
de3b70e663 - 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
5a1454fdd6 - Updated unit tests to use and test the new underlying structure of resizing images
df22a03877 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method
7e3e808a15 - 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
3164afffe3 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated
e7cb4250ae - 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
97642d73db - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories
d6046389f1 - 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 ....
a895e7a888 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns
5cb399c081 - 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
82491d046c Merge branch 'feature/MAR10001-837' into 3.0
2b21958cfe MAR10001-847: Fix prices in product datagrid
4625f37bb6 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class'
63e0b0c0bb Merge branch 'feature/MAR10001-845' into 3.0
ce9d72a160 MAR10001-837: Inventory batch layout
43fc12dfba - 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
c88c25a6df MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener
6456a5a6f7 - 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
7f1cc1c91a Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0
3b5d64f244 - removed empty line from services.yml
643f192900 Merge branch 'feature/MAR10001-842' into 3.0
3d84eb8fca - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container
442821802f Merge branch 'feature/MAR10001-776' into 3.0
df69a307ff Merge branch 'feature/MAR10001-776' into 3.0
8e581df3cd MAR10001-776: Inventory Batches - fixed bug in replenishment
0d9ee3bfd2 - preparations for release
90afec03be Merge branch 'feature/MAR10001-776' into 3.0
3b96c1ab97 - 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
82c3f40ac9 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled
b6a01edcf0 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to
98f43ba757 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs
7c337e3746 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders
f85becbb06 [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
d9c7987cc6 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid
6e852b56fc - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge
f75dcb12fb - 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
0db88c5cbb - 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
341bcf112b - 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
ed4a9260de 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
b61114fe80 - 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
e13e8a23cf - 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
d3c9ffc21e MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid
afde76c67b Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3
ff58c510e8 - updated invoice email attachment template to match the subject of the invoice notification email
0c624a7fee Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3
2aea7fbc03 - 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
7930e5350f - 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
8d081b5df7 - updated customer update view to correctly display name in the tab of the browser
c201b18b07 - removed old bundle of Servicepoints, Servicepoints are now a separate package
e7bebd421b - added service points as new package - added docker-compose file for service points application
cd27da7f56 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices
53bc5f4351 - fix controller - fix view
d60ab65bd5 - fixed create return button on order view page after the status of items have been changed to enums instead of strings
99491f1076 - fixed order of import for multiple entity.js of purchase order
2fbe58179f - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone
3c199c7d4b - reworked the multiple entities setup for purchase orders regarding js components
de33b40003 - fixed typo in item view of purchase orders
1d17473b18 CRH19001-18; Change date formtype
5bd5f585b8 CRH19001-18; Refactor form handler for business hours overrides
283224e715 - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle
93e0f7a301 CRH19001-18; Fix business hours overrides datagrid
05d3ee90cc - 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
358bc16eb8 - 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
cea6de24e2 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form
603973a833 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3
10cbe2cf78 - updated emailtemplate action to comply with php 7.2.x
55f2f27915 - make service public in order to use the service within symfony 4.4.x framework on other places
58ae37ab3b Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3
bf503d4350 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3
0b2acad22c merged branch 3.0 into feature/MAR10001-776
61cb213344 MAR10001-776: InventoryBatches
068d74d3df Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3
fe9ee212be Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3
e986b56fa9 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3
9f96de829f CRH19001-18; Add business hours overrides
1442a7d762 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription
e0d0dda2ac CRH19001-18; Manage collections of business hours in form handler
3f7c9317c5 CRH19001-18; Always show all days in form
c6808d4d95 CRH19001-18; Fix validation
c595b65716 - 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
7a03e31477 CRH19001-18; Rewrite business hours datastructure [WIP]
0ca22d1422 CRH19001-18; Rewrite business hours datastructure [WIP]
87cdbddbd1 CRH19001-18; Rewrite business hours datastructure [WIP]
fa42383975 CRH19001-18; Update form view for business hours
500e23654d CRH1900-18; Fix validation
1a93d8f046 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points
403dedfa6c CRH19001-18; Updates to form theme
9b0fbd240f - updated all Marello CE bundles with the new format for webpack
08f29d3e82 CRH19001-18; Fix view page when no image selected
2ddc084de0 - 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
5dcaef4c7c - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc
55389791d6 CRH19001-18; Add custom form theme for service point business hours
6c3e97f498 MAR10001-776: Inventory Batches - new comments fixed
c55dd80ab4 CRH19001-18; Fix timezones of TimePeriod entities
915d6b6fc4 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
39215f2e6a MAR10001-742; Add ability to add attachments to notifications from workflow action
43d599a5e1 MAR10001-742; Add ability to add attachments to notifications via SendProcessor
e08240baac MAR10001-742; Add attachments to Notification
6c73a2673d MAR10001-742; Add v1_0 migration for NotificationBundle
b5df9841fd MAR10001-742; Fix typo
db986fead1 - reverted to old sticky note icon
dddea172b6 - changed the sticky note text - reverted commmented line in phpunit.xml
beb726cda6 - fixed the sticky note description and logo - updated help link on the question icon on the top
5938f580aa MAR10001-13; Add white background color to PDF template
00461a3d81 MAR10001-13; Add configuration button on sales channel view
373fac5383 CRH19001-18; Validate timeperiod validity
185587f5f9 CRH19001-18; Allow multiple timeperiods per day
5c269df542 MAR10001-774: Remove increase / decrease external warehouses option
eae9820367 - CS fix
aff92ca9cc Merge branch 'feature/MAR10001-765' into 3.0
cc8284f5b0 Merge branch '3.0' into feature/MAR10001-776
5d90b4d8bb MAR10001-802: WFA rule index is not rendering
3298d7fcda MAR10001-765: Update InventoryRebalance Command
e0f6532d50 MAR10001-776: Inventory Batches - bug fixed
d016d877d3 MAR10001-776: Inventory Batches - bug fixed
5bae55cf31 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order
1fd2580e32 - 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
9c398bc65a - 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
dccd932a01 Merge branch 'feature/MAR10001-770' into 3.0
c5c22bd721 Merge branch 'feature/MAR10001-775' into maintenance/2.2
2fec41981a Merge branch 'feature/MAR10001-775' into 3.0
fdb762cc77 Merge branch 'feature/MAR10001-769' into 3.0
1d9beba640 - updated dev.lock with Oro Platform beta 4.1
db50f7cc3e MAR10001-776: Inventory Batches - removed temp code
7a945dbd59 MAR10001-776: Inventory Batches
f112a14e5c - 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
cdb282c591 - 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
6578d01bc4 Merge branch '3.0' into feature/MAR10001-770
c0ab2de3d6 fixed bug on order create page
bd9ca3692f MAR10001-770: Order statistics widget: filter by SalesChannel
d686c8bf67 - Added migration to include organization id on the purchase order item
24898c61be - Added data column to PurchaseOrder
a86b2a0ed6 MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first
4342e9cda5 MAR10001-766: OroCommerce Bridge
481d27f179 Merge branch 'develop' into feature/MAR10001-769
688913458a Merge branch 'feature/MAR10001-758' into develop
d9e7dd5a18 Merge branch 'feature/MAR10001-758' into maintenance/2.2
3a6ceeebef - CS fixes
92cc9eafcb Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2
3b0112bb93 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2
53a0e0fe76 - updated branch aliases
3069732a94 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2
6bb210c740 MAR10001-759: Update OroCommerce bridge for Marello 2.2
b405650589 - CS fixes - Changed php version back to 7.1
bfa8d0a010 CRH19001-18; Add API
ed9ceec43d CRH19001-18; Add map to service point view page
07cf5faeed CRH19001-18; Add service point image to view
b996811d8c CRH19001-18; Add EntityConfig
2796bc42ad CRH19001-18; Add ACL
7253212610 CRH19001-18; Add controllers and views
1ab4140c16 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket
85b581198e Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2
75543a6404 MAR10001-759: Update OroCommerce bridge for Marello 2.2
0a34a36913 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels
af59a86f6c Merge branch 'develop' into feature/MAR10001-758
15e7c2de73 MAR10001-769: Show 'Cost' currency on de Product edit page
bfcfe51dc3 CRH19001-18; Add Forms
566a8047eb CRH19001-18; Add validation
8f81e069ab CRH19001-18; Add translations
4f0f4472c1 CRH19001-18; Add data model
181ba0b28b CRH19001-18; Add ServicePointBundle
36491f5d88 - Changed column source on invoice and creditmemo items product sku and name
d56c29a1f5 Merge branch 'feature/MAR10001-674' into develop
902777e475 - Disabled OrderOnDemand widget in Inventory view / update in order to prevent the usage of the unfinished feauture
cd96ad2fcd Merge branch 'feature/MAR10001-674' into develop
cb7397a38e Merge branch 'bugfix/MAR10001-764-stop-override-orderitem-status-when-already-set' into develop
e21f585dcb - Added check to prevent overriding OrderItemStatus when already set on creation
10cfcd0c26 Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop
71f17ce1d8 - Added additional check to verify there is a product to get the inventory item from when passed back to the import processor
e9b8cb5546 - Added additional check to inventory level update strategy to check wether the product of the 'associated' inventory level exists before importing and throwing errors
075389df6a removed useless fields from oro_entity_config_field
968d3d9e36 fixed bug in Migrations versions
ddab3fa39d fixed bug in Migrations versions
f69acc4469 fixed bug in OrderBundle migration
703364dd86 merged branch develop into 3.0
f844a1ca2d Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop
61f30e140f Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1
4fd373a5b6 merge branch 3.0 into feature/MAR10001-730
92214326e6 merge branch 3.0 into feature/MAR10001-714
1b7c9737ca 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
f6ede87a76 Merge branch '3.0' into feature/MAR10001-725
01f560bbe7 Merge pull request #16 from marellocommerce/feature/MAR10001-751
89e25ec89b Merge branch '3.0' into feature/MAR10001-718
896f1bd97c Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop
d1fd8a090d - updated PurchaseOrderBundle schema versions to take the 'next' version of Marello (2.2) into account
8ad671de85 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop
82e0205502 - CS fix
ee2489e990 - 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
baf6ce615b - 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
4b2615016f - Added migration for updating existing InvoiceItems with Organization - Added migration for adding ownership to ReturnItems - Added migration for updating existing ReturnItems with Organization
30353c01c0 MAR10001-751: Rename  columns to
e81ccf1397 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs
bbffc57fe2 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle
e4d8f4973e merge develop branch into feature/MAR10001-717 '
016a88d9de - Added migration to update current credit/invoice items with organization based on the parent entity's organization
44bb82a11b MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels
55caada862 - updated PackingSlipItem test to include organization - Added translation for PackingSlipItem organization
e5abc43e6a - 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
c2e041aa3e - Added ownership field to Oro config
d1b406c8d4 - Added organization ownership to InvoiceItems - Added translations for organization - Added migration to update schema with organization
19775441d0 - Added organization ownership to OrderItem for applying ACL when reports are created with the items
e84fe56b4c - Added Organization ownership to Supplier entity - Added test to verify the organization is set when a new supplier is being created
8bc66364ae MAR10001-674: Order on demand - updated OOD validator - fixed bugs in order items statuses changing
e7e7a14f35 - updated rendering of OrderNumber link and SalesChannel link on various views for quick navigation - added quick navigation link to customer on Invoice view
4859ab9d03 - Added product sku rendering link to RefundItem's datagrid for quick navigation
5d7eb3af80 - Added product SKU rendering link to ReturnItems grid for quick navigation
980ff3c964 - Added product sku rendering link to PackingSlip item grid for quick navigation
3090ea22fb - Added product sku link rendering to Invoice Item grid for quick navigation
4343ca21df - Added product sku link rendering to order item's product in order item datagrid
398f1459ec - 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
9fcb639852 - 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
e392127544 - Added quick navigation for customer on Order View - Updated quick navigation for SalesChannel link on Order View
37433d1ec4 MAR10001-714: Payment methods
97059a43a3 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow
833db6fa4f MAR10001-742; Add tests
9c49ea3fcc MAR10001-742; Check if invoice workflow transition is set
391276bb71 MAR10001-742; Remove debug code
a518151789 MAR10001-742; Add workflow actions to send invoice e-mail
eb019896a8 MAR10001-742; Add translation
7a22819041 MAR10001-742; Add migration for invoice e-mail template
5197a78d51 MAR10001-742; Add IsSendEmailTransition workflow condition
95b51422f3 merged develop branch into feature/MAR10001-714 branch
45faee70c0 - 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
9ab72e4522 Merge branch 'develop' into feature/MAR10001-674
c08ff89542 - CS fix -> fixed docblock
e9c1caf2c3 Merge branch 'feature/MAR10001-739_Payment-term-invoice' into develop
a02adf01bf Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop
caeebb8554 - Added Migrations to update entity_config tables and entity_config_field tables to set auditable to false for InventoryLevel && BalancedInventoryLevel
f12d8b32db Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop
ad1f8e1077 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow
39649ac6d6 - 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
94dc6b9304 - 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
916fe29d7e MAR10001-742; Add e-mail settings about sending invoices
4c41e51514 MAR10001-739; Fix migration namespace
7663b85d5f - CS Fixes
fb474fbb88 Merge branch 'feature/MAR10001-674' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-674
a80caf8af5 MAR10001-674: Order on Demand - fixed warehouses calculations for order
58caaf643d - remove unused code from validator
cfc1569d0c - Removed unused code - Added CS fixes where necessary
1514d992ff MAR10001-674: Order on Demand
81eeb78342 MAR10001-674: Order on Demand
c0e4dfa344 - Updated dev.lock files - Updated oro platform to version 3.1.13
dd509f05db backmerged develop branch into feature/MAR10001-730 branch
5f8bc9bf89 MAR10001-730: Update CustomerBundle with Customer
88b1265062 MAR10001-742; Add workflow action to send email with attachment
0396909dab MAR10001-739; Add payment term to invoice view
092e4dd6db MAR10001-739; Calculate invoice due date
34f4b459ae MAR10001-739; Add payment term during invoice generation
931854b73a MAR10001-739; Add getCustomerPaymentTerm to PaymentTermProvider
574b4b5f94 MAR10001-739; Add payment term to invoice model
d804c235f4 MAR10001-13; Add demo data for invoice configuration
3c39998425 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop
32a8e97f4a - Fixed typo in class name
63bcb3932d Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop
0c260a20c3 - Small CS fixes; new line on end of file, formatting ano function over multiple lines
624ca71682 MAR10001-730: Move Customer
e89cc46bdb MAR10001-13; Add functional test
e9ac295074 MAR10001-13; Update TableSizeProviderTest
de8e3d26d4 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1
7984fc3e82 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1
c295d88b14 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop
d8e50be874 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements
1379ec2829 - Added test to verify correct registration of cron command - updated code to include correct registration of cron command
88ca77277d MAR10001-13; PdfBundle unit tests
08a0633b9f MAR10001-13; Fix PDF bugs
9cdb3c040a - 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
448f70228d Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification
c154e4c36f - Added test to verify the working of the saving of the notification as activity target
e62d2a80b7 - updated phpdocblock removing parameter that isn't there anymore
c5299bf6c4 - updated query for including purchaseInventory when selecting purchaseOrderItemCandidates
243f6852cb - 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
a8ad8f7fc7 Merge branch 'develop' into feature/MAR10001-676-purchase-order-noti…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Akshaynikhil-zz