Set IsDropship and IsUseHandover flags when creating an order #12118
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
metas-ts
added a commit
that referenced
this pull request
Jan 18, 2022
(cherry picked from commit 9b53b74)
cristinamghita
added a commit
that referenced
this pull request
Jun 10, 2022
metas-ts
added a commit
that referenced
this pull request
Jun 11, 2022
Why: Merge EDI-features that are ahead of latest stable (#13136) * #11953 Compute properly the gross weight in Customs Invoice (#11954) #11953 Compute properly the gross weight in Customs Invoice * avoid getting the wrong db images (cherry picked from commit 7204cc1) (cherry picked from commit 4f69fec) (cherry picked from commit 6827679) * fix possible cucumber glitch When testing the API, allow for an async call to already be "processed" and not just "received" by the time the check is made (cherry picked from commit 9ddcddc) (cherry picked from commit 94712f3) * Nachbelastung (Kreditoren) (#11963) * Nachbelastung (Kreditoren) #11962 * Nachbelastung (Kreditoren):set subtype to doctype #11962 * Improve relation types and add the new ones #11962 * relax timout for shipment scheds looks like jenkins isn't always that fast Co-authored-by: Tobias Schöneberg <tobias.schoeneberg@metasfresh.com> * avoid getting the wrong db images (cherry picked from commit 7204cc1) (cherry picked from commit 4f69fec) * Ic hf ac (#11972) * ic hotfix nachbelastung vendor #11962 * Nachbelastung (Kreditoren):set subtype to doctype #11962 * Improve relation types and add the new ones #11962 * adapt SQL to older metasfresh version #11962 * ensure positive service fee amount also for credit memos (#11990) * update the invoices' isPaid flag when allocation is completed (#11998) * update the invoices' isPaid flag when allocation is completed * if didn't happen if a credit memo was allocated against a payment and a service invoice * i did remove almost all now redundant calls too * Intensive care hotfix creditmemo paid (#12010) update the invoices' isPaid flag when allocation is completed * if didn't happen if a credit memo was allocated agains a payment and a service invoice * i did remove a bunch of now redundant calls too fix the allocations for creditmemo & incoming payment * add to DESADV-XML C_BPartner.Name2 and also HandOver- & Dropship-Partner #11859 * fix archive_c_queue_data DB function #12095 * Set IsDropship and IsUseHandover flags when creating an order (#12118) * #12278 Show delivery address on customs invoice if there are several shiopments (#12279) #12278 Show delivery address on customs invoice if there are several shiopments * solve compile errors when building with java-17 (cherry picked from commit 3729f8f) (cherry picked from commit 1219779) (cherry picked from commit 09dc823) * Don't add the RemittanceAdvice's service fee sum to the payment (#12320) It is just for info * update C_Order_Seq, see comment for why (cherry picked from commit 551881f) * fix after_transfer_db_custom functions' param names * Fix InvoiceProcessingServiceCompanyService#retainIfServiceInvoiceWasA… (#12395) Fix InvoiceProcessingServiceCompanyService#retainIfServiceInvoiceWasAlreadyGenerated refs: #12393 Co-authored-by: cp-ps <77785468+cp-ps@users.noreply.github.com> * SqlOrderByValue: sqlSelectDisplayValue case: order by column$Display[1]; QA/refactor (cherry picked from commit 5407baf) * Attempt to fix migrationTest (cherry picked from commit f08aaa5) * Gh12420 add preparation date offset (#12428) * Add sysconfig that allows to set the offset for initial PreparationDate calculation in de.metas.tourplanning.api.impl.OrderDeliveryDayBL * Attempt to fix migrationTest * Add sysconfig that allows to set the offset for initial PreparationDate calculation in de.metas.tourplanning.api.impl.OrderDeliveryDayBL Co-authored-by: Adrian <adrian.stefan@metasfresh.com> * Add Offset as Hours (#12441) * Add Offset as Hours * Add Offset as Hours * Add Offset as Hours * #12435: General ledger journal debit/credit not updated (#12436) * always set invoice-doctype when creating an IC for olc, ol and iol (#12354) * always set invoice-doctype when creating an IC for olc, ol and iol because otherwise, ICs that have no doctype but will get the standard-invoice-doctype are not added to the same invoices as similar ICs that already explicitly have this doctype * Set target invoice doctype to Flatrate invoice candidate #12475 Co-authored-by: metas_rc <ruxandra.craciunescu@metasfresh.com> * Extend/Change INVOIC EDI for additional requirements * Extend/Change INVOIC EDI for additional requirements * change DESADV 0110 to DESADV 0702 * Revert "change DESADV 0110 to DESADV 0702" This reverts commit 6e5abef. * attempts to fix div unit tests * fix tests and also template * fix tests * fix tests * bump-up camel and smooks versions * Revert "bump-up camel and smooks versions" This reverts commit d9bda6a. * Revert "fix tests" This reverts commit 7d2c76a. * Revert "fix tests" This reverts commit 8987204. * Revert "fix tests and also template" This reverts commit 774ec5c. * Revert "attempts to fix div unit tests" This reverts commit 61cd166. * Revert "Extend/Change INVOIC EDI for additional requirements" This reverts commit 5a8a15c. * Revert "Extend/Change INVOIC EDI for additional requirements" This reverts commit 6a721f8. * Revert "Revert "Extend/Change INVOIC EDI for additional requirements"" This reverts commit 70d8bf0. * Revert "Revert "Extend/Change INVOIC EDI for additional requirements"" This reverts commit 7ee1903. * Revert "Revert "attempts to fix div unit tests"" This reverts commit 4745e34. * Revert "Revert "fix tests and also template"" This reverts commit b3e633a. * Revert "Revert "fix tests"" This reverts commit 8055431. * Revert "Revert "fix tests"" This reverts commit 6c59e8f. * Revert "Revert "bump-up camel and smooks versions"" This reverts commit 45baff2. * #12498 fix ORDER BY so that instead of sorting by the entire array, only sort by the displayed value (#12499) * #12498 fix ORDER BY so that instead of sorting by the entire array, only sort by the displayed value (cherry picked from commit a3bdc83) * #12498 prevent TRL problems with ORDER BY criteria (#12505) (cherry picked from commit aa788cd) * try to solve the problem of missing smooks-2.0.xsd * bump edi to java-17 (#12533) * also update edi to latest smooks, camel and spring-boot versions * add additional fields also to table and exp_format #12474 * make DeliveryRule and DeliveryViaRule non-mandatory * allow setting DeliveryRule and DeliveryViaRule from application.properties * Merge remote-tracking branch 'origin/tasty_ham_uat' into intensive_care_uat solved Conflicts: backend/de.metas.contracts/src/main/java/de/metas/contracts/invoicecandidate/HandlerTools.java backend/de.metas.cucumber/src/test/java/de/metas/cucumber/stepdefs/apiauditfilter/ApiAuditFilter_StepDef.java * attempt to solve after-merge error * fix bug+cucumber test problem * attept to fix failing tests * attempt to solve junit problems * Accounting support functions improvements & fixes (#12623) * 5624750_sys_m_inventoryline_id_related_indices.sql * `backup_table` db function * improve/fix m_inventoryline update functions * Fact_Acct_Summary_RebuildAll db function; improve Fact_Acct_EndingBalance_RebuildAll * Update_C_BPartner_Stats: added TODO * fix product_costs_recreate_from_date db func * accounting: m_inventoryline_hu acct functions fixes & improvements * FactAcctLog processor improvements * assert_period_open_by_record: handle C_Payment (#12261) * Prices with ASI (#12638) * Corrections in invoice cand aggregator (#12625) * Bring back standard invoice cand aggregator #12624 * correction in quality discount aggregator #12624 * invoice candidate qtyToInvoiceBeforeDiscount #12624 (cherry picked from commit 54dc906) * Intensive care uat age range (#12632) * Before and after months age #12570 * Before and after months age #12570 * Before and after months age proto #12570 * Before and after months age proto ( not working) #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * initialize locally until I see what I can do with the tests #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * Before and after months age proto #12570 * add a few NonNull annotations * Update backend/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/impl/HUQueryBuilder.java * This is nullable because it can be created from DD_Order as well #12570 * trl #12570 * Ignore null attribute values, like it's done in HUStorageQuery.addAttribute(I_M_Attribute, String, Object) , so the attributes are treated equally from both versions of picking #12570 Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com> * webui: fix sorting by multiple columns (#12655) * FE: build the orderBy string considering all fields * hotfix: ordering by a virtual column which is NOT a lookup was failing * Price sort by pricelist and validFrom (#12658) #12657 * Move picking config v2 to handlingunits package (#12661) * Move picking config v2 to handlingunits package #12660 * Picking config v2 available in tests #12660 * M_InventoryLine.IsExplicitCostPrice (#12664) * * Propagate IsExplicitCostPrice #12663 * * Propagate IsExplicitCostPrice #12663 not done * * Propagate IsExplicitCostPrice #12663 not done * * Propagate IsExplicitCostPrice #12663 not done * * Propagate IsExplicitCostPrice #12663 not done * Split scripts #12663 * migration improvement #12663 * trl #12663 * trl #12663 * use boolean for the flag #12663 * use boolean for the flag #12663 * bring back exception throwing #12663 * refactoring #12663 * refactoring #12663 * Refactoring #12663 * New test #12663 * script improvement #12663 * trl #12663 * trl (#12698) #12663 * StepDefData refactoring * refs: #12808 fix procurement-webui-frontend build fail (#12809) (cherry picked from commit 2c693bf) * refs: #12808 fix procurement-webui-frontend build fail (#12809) (cherry picked from commit 2c693bf) * #12879 Show all date attributes in fresh_Attributes View (#12880) #12879 Show all date attributes in fresh_Attributes View * #12760 add CampaignPrice export process & import format (#12872) * #12760 add CampaignPrice export process & import format Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com> * #12760 prevent cucumber error when priceList_Version is reused (#12903) * Add offset to preparation date (#12906) * webui frontend: Date/Time widget fixes (#12667) * minor * DatePicker: on double-clicking on a day, use that day and merge into it the current selected time * TableRow.handleKeyDown: break down the function to smaller functions. This changes does not change/fix anything. It's just a refactoring! * widgetHelpers.js: QA * WidgetRenderer.js: use getFormattedDate as a static function. don't have to bind * WidgetRenderer.js: QA * minor * DatePicker.propTypes.timeFormat * TableRow: move propTypes from tableHelper * TableRow: minor jsdoc fix * TableRow.handleKeyDown_Enter: do nothing in case of Attributes because it was just clearing the current value?!. We will have to really fix it, but for now we are just preventing clearing to value other fixes: * fix F2 * QA * move the FocusTrap usage from Attributes to only AttributesDropdown * misc fixed on DatePicker * WidgetRenderer.propTypes, RawWidget.propTypes - inline it from PropTypes.js * AttributesDropdown: hotfix: allow clicking on date picker calendar navigation buttons * RawList.propTypes.wrapperElement: change it from node to object to avoid console warning * DatePicker: use closeOnSelect=false * AttributesDropdown: FocusTrap: escapeDeactivates=false * QuickActions: remove mounted property because it's not used * DatePicker massive fixes & refactorings * QA * javadoc * fix Attributes.test.js * fix TablesActions.test.js * WidgetRenderer: send isModal prop to Attributes * cleanup/QA/fixes Attributes and AttributesDropdown * cleanup/QA/fixes Attributes and AttributesDropdown * hotfix: formatDateWithZeros shall not be an async function; QA * fix tests * remove unsed property * extract static function * Image.js: catch exception * minor * convert Attributes to functional component * convert AttributesDropdown to functional component * hotfix: when clicking on a day in calendar the whole attributes dropdown was closing * fix jsdoc * minor/QA * fixes around on click outside * RawWidget: avoid state change if unmounted; add missing PropTypes * hotfix: error when trying to open attributes from a view (test case: shipment dispo -> Quick edit -> Attributes) * hotfix TableRow: don't update state if component is not mounted * #12760 prevent error when multiple campaign prices are matching, fixed date formats * creating pg-init to test the migration script fails; comment it out (#12984) (cherry picked from commit 535aeaf) * creating pg-init to test the migration script fails; comment it out (#12984) (cherry picked from commit 535aeaf) * Gh12953 invoicing support aggregating different values where possible (#12954) * Scary plum ic agg (#12914) * deactivate contact form the invoice candidate aggregator #12849 * proto start #12849 * invoice contact null when different #12849 * switch base type for negative amts invoices #12849 * switch base type for negative amts invoices #12849 * switch base type for negative amts invoices #12849 * switch base type for negative amts invoices #12849 * switch base type for negative amts invoices (#12944) #12849 * Proto start * task 12953 : prevent SalesRep_ID from being a header aggregation criteria Co-authored-by: Ruxandra Craciunescu <ruxandra.craciunescu@metasfresh.com> * Export PP_Orders with extended infos (#12988) * Export PPOrder sqaushed (#12985) * Export PPOrder & pass it to FTP server * export PPOrder refactoring * Cucumber testing - minor refactor Co-authored-by: av-ps <alexandra.vezendan@pevesoft.ro> * small refactor * Minor refactor * refs: #12931 * refs: #12931 * Fix cucumber test Co-authored-by: cp-ps <77785468+cp-ps@users.noreply.github.com> Co-authored-by: cp-ps <cp-ps@pevesoft.ro> Co-authored-by: fp-ps <fp-ps@pevesoft.ro> * log to loggables why an attribute based price is not applied (#13045) * Scale Price not used despite usescaleprice=S (#12981) * refs: #12980 * automation tests and the refactoring associated * remove explicit order line update from automation tests Co-authored-by: Tobias Schöneberg <metas-ts@users.noreply.github.com> (cherry picked from commit af981da) solved Conflicts: backend/de.metas.cucumber/src/test/java/de/metas/cucumber/stepdefs/pricing/M_PriceList_StepDef.java * fix scale prices tests (cherry picked from commit 9d0b403) * EDI - Extend INVOIC export format (#13020) * EDI - Extend INVOIC export format refs: #13017 * fix cucumber scale prices tests after merge (#13051) * DatePicker hotfix: clicking on calendar icon to open the calendar and then clicking on calendar icon again to close it was clearing the input field (#13034) (cherry picked from commit 3b05ec0) * gh13046 (#13047) DatePicker.convertToMoment: consider DATE_TIMEZONE_FORMAT as last option. Needed when using DatePicker component in custom forms copy-paste from d2b6f4e as direct CP does not work (cherry picked from commit 6d06fc4) * fix cucumber test * #gh13048 add Next Vs AfterNext Pricelist Comparison report SQL functions and process (#13049) * #gh13048 add Next Vs AfterNext Pricelist Comparison report SQL functions and process * #13048 Add jasper repot next vs next_nest * #13048 Use proper function * #gh13048 also include rows with no AfterNext PLV * #gh13048 remove ad_Process.isupdateexportdate from migration script Co-authored-by: Cristina Ghita <cristina.ghita@metasfresh.com> * Optimize Fresh_Account_Info_Report function (#13055) * Pricing issue (#13065) refs: #13062 * make SQL robust wrt custom windows refs #13062 * Allow to not create age attribute instance when it's not wanted (#13080) * attempt to solve startup-error * attempt to solve startup-error * Fix AD_Reference "PP_Product_BOMVersions" and add filter columns (#13099) * apply a bit of additional polish #13098 * Pricing issue cucumber (#13109) (#13110) * refs: #13062 pricing issue cucumber coverage * after merge fixes * Revert "Revert "Extend/Change INVOIC EDI for additional requirements"" This reverts commit 70d8bf0. (cherry picked from commit d3720a7) * after-merge fix * copy certain helpers to run cucumber locally from master branch * hopefully fix another cucumber test (cherry picked from commit 33acc11) Co-authored-by: Cristina Ghita <cristina.ghita@metasfresh.com> Co-authored-by: Ruxandra Craciunescu <ruxandra.craciunescu@metasfresh.com> Co-authored-by: dm-ps <83770997+dm-ps@users.noreply.github.com> Co-authored-by: cp-ps <77785468+cp-ps@users.noreply.github.com> Co-authored-by: Teo Sarca <teo.sarca@metasfresh.com> Co-authored-by: Adrian <adrian.stefan@metasfresh.com> Co-authored-by: riadmen <93593841+riadmen@users.noreply.github.com> Co-authored-by: Chems Nouioua <chems.nouioua@gmail.com> Co-authored-by: adi-stefan <60300682+adi-stefan@users.noreply.github.com> Co-authored-by: av-ps <alexandra.vezendan@pevesoft.ro> Co-authored-by: fp-ps <78536821+fp-ps@users.noreply.github.com> Co-authored-by: av-ps <89453802+av-ps@users.noreply.github.com> Co-authored-by: cp-ps <cp-ps@pevesoft.ro> Co-authored-by: fp-ps <fp-ps@pevesoft.ro> Co-authored-by: mi-ps <103928467+mi-ps@users.noreply.github.com> Co-authored-by: mi-ps <mihai.ispas@pevesoft.ro> Co-authored-by: dm-ps <dragos.moca@pevesoft.ro>
cristinamghita
added a commit
that referenced
this pull request
Jun 15, 2022
metas-ts
added a commit
that referenced
this pull request
Sep 12, 2022
(cherry picked from commit 9b53b74)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.