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

#6594 Trimming beggining and end white spaces from filter search queries. #6597

Closed
wants to merge 1,538 commits into from
Closed

#6594 Trimming beggining and end white spaces from filter search queries. #6597

wants to merge 1,538 commits into from

Conversation

dragospodariu96
Copy link
Contributor

metas-ts and others added 30 commits April 15, 2020 09:01
@metas-ts
CompositeInterfaceWrapperHelper: getTrxName can throw exception (#6484)
ba0f778 
instead of logging, because returning null will probably result in a new trx that will end up idle in transaction
@metas-ts
solve after merge compile error
3abb513 
#6436
@TheBestPessimist
User Query filters errors (#6478)
c420b82 
* Add testcase where a quantity/number is returned as string

#6476

* Extract `convertValueToFieldType` to own helper function, to be used in multiple places

#6476

* Use `UserQueryFieldHelper.parseValueObjectByColumnDisplayType` instead of `searchField.convertValueToFieldType`

#6476

* Use ColumnDisplayTypeProvider when calculating the object value.

This interface was introduced to ease testing

#6476

* Add logging to `UserQueryFieldHelper`; Mark `ColumnDisplayTypeProvider` as `@FunctionalInterface`

#6476
@TheBestPessimist
User Query filters errors (#1406)
d03c7b6 
* Fix User Query expecting Int contains the float value instead

Expected: 1234
Actual: 1234.000000

#6476

* Use ColumnDisplayTypeProvider when calculating the object value.

This interface was introduced to ease testing

#6476
@TheBestPessimist @metas-ts
Wrong BillTo location and contact when Sales Order created from… (#6465)
cfba787 
* Fix `ProcessExecutionResult.setRecordToOpen`

#6464

* Dont set SalesOrder BillTo details, let the system do it automatically

#6464

* Explicitly call `IOrderBL.setBillLocation` to set Bill BPartner and Bill Location.

This leaves the system to fill only Bill Contact automagically.

#6464
(cherry picked from commit 36f04a4)

solved Conflicts:
	de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessExecutionResult.java
@metas-rc @TheBestPessimist
Gh6432 open linked accounts processes (#1403)
9af8fce 
* RecordsToOpen improvements

* #6432 Open Linked Facts processes

#6432

* #6432 refactoring

#6432

* #6432 helper class for common logic in the 2 fact acct processes

#6432

Co-authored-by: Teo Sarca <teo.sarca@metasfresh.com>
(cherry picked from commit 58bf538)
@TheBestPessimist @metas-ts
Fix using system AD_User_ID for contact in some places instead… (#6445)
fac97df 
* Fix using system AD_User_ID for contact in some places instead of BPartnerContactId

#6302

* Fix test
#6302

(cherry picked from commit 3360664)
@siemiatj @metas-ts
Fix indicating YesNo filters (#2686)
e936b29 
* #2685 update filters fixtures with new data structure
#2685 fix caption test
#2685 unskip some test
#2615

* #2685 properly show caption for YesNo filter with falsy value

* #2615 fix the rest of skipped filters

* #2685 fix lint error

(cherry picked from commit 94efb22)
@cristinamghita
#6488 Move address and fix page number (#6489)
731178b
@cristinamghita @metas-ts
#6488 Move address and fix page number (#6489)
b9c58d0 
(cherry picked from commit 731178b)
@dragospodariu96
#6471 Add automatic document numbering and fix co-product componen ty…
a9f6682 
…pe. (#6472)

* #6471 Add automatic document numbering and fix co-product component type.

* #6473 Removed migration script & registering tab callout to already existing model validator.

* #6471 Simplified code.
@metas-ts
Solve bpartner lookup problem when getCreating org master data (#6492)
6172917 
#6491
@metas-ts
minor changes
b7d25a9
@metas-ts
Solve bpartner lookup problem when getCreating org master data
012a6fe 
fix unit tests
#6491
@dragospodariu96
Gh6475 (#6487)
6afc199 
* #6475 Intermediary commit.

* #6475 Intermediary commit.

* #6475 Intermediary commit.

* #6475 Modified functions, jasper reports, and parameters to show packing instructions from product prices.

* #6475 Fixed wrong referenced function name.

* #6475 Fixed wrong referenced function name.

* #6475 Updated AD_Element name.

* #6475 Updated AD_Element name.
@dragospodariu96
Gh6446 3 (#1409)
fbd54d0 
* #6446 Intermediary commit.

* #6446 Made Set Ownerhip action work as a toggle & added translations for it.

* #6446 Setting flag value from parameter.
@dragospodariu96
Gh6446 3 (#6490)
2c11b03 
* #6446 Intermediary commit.

* #6446 Made Set Ownerhip action work as a toggle & added translations for it.
@TheBestPessimist
Cloning with keyboard shortcut works even if action is hidden f… (#1408)
90af899 
* Throw error if cloning is disabled for table

#6482

* Throw error if cloning is disabled for table

#6482

* Add error Trl

#6482

* Use `Check.assumeNotNull` instead of `Objects.requireNonNull`

#6482
@TheBestPessimist
Cloning with keyboard shortcut works even if action is hidden f… (#6483)
8f7a9f2 
* Throw error if cloning is disabled for table

#6482

* Add error Trl

#6482
@petrican @metas-ts
Fix double loading #2683 (#2684)
15ff731 
Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
(cherry picked from commit 91f4975)
@petrican
Add Table redux skeleton and add flag for knowing sort actions happen (…
d49360d 
…#2688)

* Add Table redux skeleton and add flag for knowing sort actions was triggered #2681

* Fix linter errors and tests #2681

Co-authored-by: Petrica Nanca <petrica.nanca@metasfresh.com>
@dragospodariu96
#6466 Updated Warehouse Effective Filter (#6496)
4df4fa4
@TheBestPessimist
webui views: sysconfig to configure how much time we keep the v… (#1407)
39f76f8 
* Make `DefaultViewsRepositoryStorage`'s view expiration timeout configurable

#6480

* Read viewExpirationTimeout from sysconfig

#6480

* Change expiration timeout unit to Minutes from Hours

#6480

* Remove redundant import

#6480
@TheBestPessimist
webui views: sysconfig to configure how much time we keep the v… (#6481)
542299d 
* Add sysconfig migration script

#6480

* Change expiration timeout unit to Minutes from Hours

#6480
@TheBestPessimist
Set trl again for Current vs Previous Pricelist Comparison Report
43ba9f6 
Regression: Trl is ok locally, but wrong on client webui.

#6394
@TheBestPessimist @metas-ts
Set trl again for Current vs Previous Pricelist Comparison Report
48bea26 
Regression: Trl is ok locally, but wrong on client webui.

#6394
(cherry picked from commit 43ba9f6)
@cristinamghita
#6451 Adjust and corect sums for tax accounts report (#6498)
14db17a 
* #6451 Add dateFrom and DateTo as params instead of C_Period_ID

* #6451 Add indexes

* add indexes on fact_acct to omprove perfomance
* both indexes: query runs in 5 s 514 ms
* no index: query runs in 7 m 30 s 305 ms
* old query from report.tax_accounting_report was running in 3 m 17 s 565 ms

* #6451 Add funciton for getting the balance

* #6451 Adjust tax__accounting_report funciton to match the new logic

* #6451 Show coorect data, summing the correct taxes

* #6451 Show coorect data, summing up the correct taxes WIP

* #6451 Show balance  to year and current period

* #6451  Fix all sums

* #6451  Speed up the function

* #6451 Add materialized view and functions to speed up reporting

* #6451 Add scheduler to refresh the MV each night

* #6451 Leave the old repor as it is

* #6451 Add new separate report

* #6451 Set proper path

* #6451 Add new report

* #6451 Add funciton and adjust reports

* #6451 Replace parameters (period with DateForm - DateTo)

* #6498 Add tax_accounting_report_details function
@metas-ts
minor improvement at toString method
43a41f3 
metasfresh/metasfresh-webui-frontend-legacy#2691
@metas-ts
improve logging
934d21e 
metasfresh/metasfresh-webui-frontend-legacy#2691
@metas-ts
Solve bpartner lookup problem when getCreating org master data
20be499 
- add property to olcand-JSON that allows to advise metasfresh on the way to lookup existing bpartner data (GLN, externalId or value)
- cleanup in JsonServiceFactory: remove obsolete RecordChangeLogRepository stuff
- improve logging
#6491
dragospodariu96 and others added 28 commits May 5, 2020 17:57
@dragospodariu96
#6573 Fixed wrong seqno generation in product ingredients sub-tab. Al…
03557ff 
…so ordering ingredients desc by seqno. (#6574)
@metas-ts
cleanup (sync from master)
c060bdd
@metas-ts
sync file-move that was done in master
c9f9a9e
@metas-ts
Merge remote-tracking branch 'origin/invisible_croissant' into master…
f31f3f6 
…_legacy
@metas-ts
Merge remote-tracking branch 'origin/invisible_croissant' into master…
1deb615 
…_legacy
@metas-ts
Merge remote-tracking branch 'webui-api/master_legacy'
928c0c2
@metas-ts
Merge remote-tracking branch 'edi/master_legacy'
94a5053 
solved Conflicts:
	misc/services/edi/src/main/java/de/metas/edi/esb/route/DownloadMiscFilesRoute.java
@metas-ts
Merge remote-tracking branch 'origin/invisible_croissant'
ebba029 
solved Conflicts by "ingoring" all incoming changes; we have already merged the real changes via invisble_croissant_legacy => master_legacy => master
@teosarca
avoid calculating service again if there is already a service fee inv…
0ce2164 
…oice (#6578)
@metas-ts
Gh6514 (#1417)
d090068
@metas-ts
Gh6514 (#6585)
7bc1c8f
@metas-ts
Merge remote-tracking branch 'origin/master_legacy'
6b95821 
solved Conflicts:
	backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5557730_sys_gh6514_C_Payment_C_BankStatatementLineRef_ID.sql
	backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5557731_sys_gh6514_C_Payment_unique_indexes.sql
	backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5557790_cli_gh6514_migrate_payments.sql
	backend/de.metas.adempiere.adempiere/migration/src/main/sql/postgresql/system/10-de.metas.adempiere/5557800_sys_gh6514_C_Payment_fix_IsCalculated.sql
	backend/de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementAndLineAndRefId.java
	backend/de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementId.java
	backend/de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementLineId.java
	backend/de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementLineRefId.java
	backend/de.metas.business/src/main/java/de/metas/banking/BankStatementAndLineAndRefId.java
	backend/de.metas.business/src/main/java/de/metas/banking/BankStatementId.java
	backend/de.metas.business/src/main/java/de/metas/banking/BankStatementLineId.java
	backend/de.metas.business/src/main/java/de/metas/banking/BankStatementLineRefId.java
	backend/de.metas.business/src/main/java/de/metas/payment/api/PaymentReconcileReference.java
	backend/de.metas.business/src/main/java/de/metas/payment/api/PaymentReconcileRequest.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementAndLineAndRefId.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementId.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementLineId.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/BankStatementLineRefId.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/payment/impl/BankStatementPaymentBL.java
	de.metas.banking/de.metas.banking.base/src/main/java/de/metas/banking/payment/modelvalidator/C_Payment.java
	de.metas.business/src/main/java-legacy/org/compiere/model/MPayment.java
	de.metas.business/src/main/java/de/metas/payment/api/IPaymentBL.java
	de.metas.business/src/main/java/de/metas/payment/api/impl/PaymentBL.java
@metas-ts
Merge remote-tracking branch 'webui-api/master_legacy'
4f9d108
@TheBestPessimist
Update github issue templates
b1f0a94
@TheBestPessimist
Update github issue templates (2)
69c12f8
@metas-ts
attempt to manually fix a move-files that i failed to do earlier
122bde2 
@teosarca @TheBestPessimist please check if i got it right, it affects recent work of the two of you
#6514
@TheBestPessimist
Revert "attempt to manually fix a move-files that i failed to do earl…
d0c2f60 
…ier"

This reverts commit 122bde2

I'm trying to do the merge again
@TheBestPessimist
Fix derp merge
6079b28
@TheBestPessimist
Fix derp merge (2)
e66f66e
@cristinamghita
#6583 Fix Marginal Costing Short Version (#6584)
df615e3
@teosarca
adapt WorkspaceScriptScanner to mono repo (#6587)
f6b7d0a
@teosarca
convert some tests to junit5 + avoid jmockit usage
b997a2b
@TheBestPessimist
Sales order with Payment Rule PayPal and no contact: NPE (#6582)
025ede3
@teosarca
convert some tests to junit5 + avoid jmockit usage
9dde54e
@teosarca
fix POUtilsTest
813b611
@teosarca
fix DLMExceptionWrapperTests
b11bc20
@teosarca
Merge branch 'master' of github.com:metasfresh/metasfresh
2eadaf1
@dragospodariu96
#6594 Trimming beggining and end white spaces from filter search quer…
c5526c8 
…ies.
@dragospodariu96 dragospodariu96 deleted the gh6594_grave_goldstine branch May 6, 2020 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet