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.

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

FRESH-864 #583 Reports without ad_org_id show wrong results #632

Merged
merged 32 commits into from
Nov 23, 2016

Conversation

metas-ts
Copy link
Member

cherry-picked recent changes from branch FRESH-864 into this branch (used git cherry this time)

add ad_org_id in all umsatz reports
update functions with ad_org_id param and return
migrationscript to add ad_org_id in processes
add org in taxdeclaration
add ad_org_id in shippedinouts
add ad_org_id in statistics reports

# Conflicts:
#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/fresh_Statistics_Kg.sql
add ad_org_id in bpartner_changes report

(cherry picked from commit 1430011)
add ad_org_id in hubalance general and hubalance per day jaspers

(cherry picked from commit fa43b03)
add ad_org_id in hu_costprice report

(cherry picked from commit 218e178)
add ad_org_id in soldproducts report

(cherry picked from commit c6d9f7f)
add ad_org_id in bankstatement report

(cherry picked from commit 3f162c4)
add ad_org_id in openitems_fibu report

(cherry picked from commit 4023ef5)
add ad_org_id in picking preparation report

(cherry picked from commit 3a938ec)
add ad_org_id in kassenbuch report

(cherry picked from commit 197b09c)
add ad_org_id in versand report

(cherry picked from commit 0fedf82)
add ad_org_id in vertriebsbpartnerpunktzahl report

(cherry picked from commit 6437d58)
add ad_org_id in report_logo

(cherry picked from commit a2f3805)
fix rv_bp_changes view

(cherry picked from commit cd9eff6)
This reverts commit a44bffa.

(cherry picked from commit ef73a32)
This reverts commit 880700d.

(cherry picked from commit 715c5e9)
This reverts commit 66fbe28.

(cherry picked from commit eedc5c3)
remove process parameter from tax declaration report

(cherry picked from commit 2043434)
This reverts commit cd9eff6.
This reverts commit 218e178.
This reverts commit 3a938ec.
This reverts commit c6d9f7f.
This reverts commit 0fedf82.
revert changes, add old sql migrationscript

(cherry picked from commit 331415f)
This reverts commit 1430011.

(cherry picked from commit 620fa8e)
remove ad_org_id from rv_bp_changes

(cherry picked from commit 08dfd4d)
This reverts commit 6437d58.

(cherry picked from commit f52edb6)
@metas-ts metas-ts merged commit 940c091 into stable Nov 23, 2016
@metas-ts metas-ts deleted the FRESH-864-stable branch November 23, 2016 10:05
metas-ts added a commit that referenced this pull request Oct 13, 2017
* eventTime ranges
* AD_Org_IDs
* M_HU_Trace_IDs

also a few minor changes

HU-Trace: show all connected records #632
metas-ts added a commit that referenced this pull request Oct 14, 2017
* move some methods like TO_DATE from AdempiereDatabase to Database and
make them static. Why: 
  * they don't need a jdbc connection to work i want to use them in unit
tests
  * there is only postgresql to be supported; it that ever changes, it's
still early enough to provide other implementations for other DBs
* move the ResourceBundles for the standalone swing DB-connection editor
to a dedicated package
* delete another LDAP related class

HU-Trace: show all connected records #632
metas-ts added a commit that referenced this pull request Oct 14, 2017
metas-ts added a commit that referenced this pull request Oct 14, 2017
metas-ts added a commit that referenced this pull request Oct 14, 2017
metas-ts added a commit that referenced this pull request Oct 14, 2017
HU-Trace: show all connected records #632
metas-ts added a commit that referenced this pull request Oct 15, 2017
HU-Trace: show all connected records #632
metas-ts added a commit that referenced this pull request Oct 22, 2017
[#2761](#2761) Window Partner dist orgs: link using dropship partner
[#1317](#1317) AD_ChangeLog: don't log Updated and UpdatedBy
[#2766](#2766) add description in c_doctype_trl
[#2784](#2784) Partner Import : Add fields address3 and address4
[#1263](metasfresh/metasfresh-webui-frontend-legacy#1263) Row not selected and no actions after closing the modal view
[#480](#480) Co-Product improvement in Manufacturing
[#1258](metasfresh/metasfresh-webui-frontend-legacy#1258) Opening a new included view is broken (again)
[#2786](#2786) Drop org.adempiere.model.virtualColumn legacy functionality
[#2564](#2564) Concept for entering multiple discounts for order and subscription
[#2311](#2311) Customer Invoices and Invoice Candidates adjustments
[#1281](metasfresh/metasfresh-webui-frontend-legacy#1281) Translations of Photo Widget in User Window
[#2763](#2763) New Window Picking Tray Clearing
[#1249](metasfresh/metasfresh-webui-frontend-legacy#1249) included view: blurWhenOpen support
[#1275](metasfresh/metasfresh-webui-frontend-legacy#1275) Scrolling in Modal window throws errors
[#2768](#2768) Translate window for process "Change Password" into EN
[#625](metasfresh/metasfresh-webui-api-legacy#625) WebUI Scheduler Window Log Subtab: Invalid Client ID=0
[#1248](metasfresh/metasfresh-webui-frontend-legacy#1248) included view: wrong selectedIds when calling quickActions
[#639](metasfresh/metasfresh-webui-api-legacy#639) Can't save a new partner
[#2774](#2774) Vendor Invoice Layout and Translations in WebUI
[#1268](metasfresh/metasfresh-webui-frontend-legacy#1268) Sitemap broken
[#1227](metasfresh/metasfresh-webui-frontend-legacy#1227) The Letter window dissapears after Print Preview
[#1278](metasfresh/metasfresh-webui-frontend-legacy#1278) Shortcuts for New, Batch and Expand are broken
[#2755](#2755) error on hu changing status from shipped to active
[#1271](metasfresh/metasfresh-webui-frontend-legacy#1271) Open ANY included view broken
[#2769](#2769) model generator: wrong columns are generated
[#2750](#2750) Flatrate Import: Support tax category
[#2752](#2752) Inherit C_Taxcategory_ID and IsTaxIncluded from orderline to FT
[#2751](#2571) Report Translations to en_US: menu reports
[#2379](#2379) Procurement Candidates generate Purchase Order
[#2739](#2739) Add context into if exception happens in WorkpackageProcessorTask.processWorkpackage
[#637](metasfresh/metasfresh-webui-api-legacy#637) Move Picking Tray Clearing Functionality to new window
[#472](#472) Picking from Handling Unit Editor (WebUI)
[#1092](metasfresh/metasfresh-webui-frontend-legacy#1092) Prepare Update to React 16
[#1223](metasfresh/metasfresh-webui-frontend-legacy#1223) Scrollbar missing in Handling Unit Editor after "Internal Usage Action"
[#2726](#2726) Set correct identifiers in the table M_ShipmentSchedule (v2)
[#2731](#2731) Window Design Webui: Improve window Shipment Restrictions
[#2732](#2732) Window Design Webui : Add description field in sales order line
[#2725](#2725) Webui Window Design: Improvements in window ESR Payment Import
[#2728](#2728) Webui Design Window: Add Translations to Business Partner
[#2653](#2653) Window Design Webui: Improve Businesspartner Dist-Orgs window
[#2729](#2729) Window Design Webui: Add missing fields to window Tourversion
[#2240](#2240) npe on zoom into header aggregation
[#2730](#2730) Window Design Webui: Improvements in window Purchase order
[#2740](#2740) Picking slot Rack System flag
[#632](metasfresh/metasfresh-webui-api-legacy#632) HU-Trace: show all connected records

me-73
dragospodariu96 added a commit that referenced this pull request May 14, 2020
dragospodariu96 added a commit that referenced this pull request May 15, 2020
* #632 Intermediary commit.

* #6656 Adjusted reports layout according to customer needs & removed duplicate values in properties files.

* #6656 Reverted old reports modifications & added 2 new customized versions of those subreports.

* #6656 Only keeping one customized generic report.
dragospodariu96 added a commit that referenced this pull request May 15, 2020
* #632 Intermediary commit.

* #6656 Adjusted reports layout according to customer needs & removed duplicate values in properties files.

* #6656 Reverted old reports modifications & added 2 new customized versions of those subreports.

* #6656 Only keeping one customized generic report.

* #6656 small move to the right of the org subreport by 4 pixel to be aligned with the intercheese logo.

* #6656 aligned organisation info under intercheese logo

* #6656 aligned organisation info under intercheese logo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants