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 668 #706

Merged
merged 52 commits into from
Dec 16, 2016
Merged

Fresh 668 #706

merged 52 commits into from
Dec 16, 2016

Conversation

metas-lc
Copy link
Contributor

No description provided.

update sqls for sales and order reports and attributes
updated generics sqls
update sales and purchase invoice jasper and sql
updated simple inout
update sales inout, concrete adr, without price and individual
update basic inout
update carrot invoice
removed unused carrot invoice from sales folder
update carrot invoice main report
update manufacturing order jasper
updated letters, inout customs, paymentselection, procurement
conditions, materialtracking
update rfq reports
update biloflading and dunning jaspers
update ordercheckup and shippedinouts
updated shippingorder
updated labels, arbeitzeit report, account info report, statistics
report
updated balance_sheet (+saldobilanz and acctbalancetodate),
Fresh_Bank_Statement_Report, bpartner_changes,
deckungsbeitrag_kurzversion, deckungsbeitrag_kurzversion-with_last_year,
direct-costing+unused
updated hu_costprice,
hubalance,hubalance_per_day,hubalancegeneral,kassenbuch ,movements,
openitems, openitemsfibu, openpayments
updated picking preparation, pricelist, purchase(sales) trace,
qty_statistics and kg, request report, saldobilanz, salesgroups
updated soldproducts, tax accounting, tax info, tax registration,
umsatzliste, umsatzprokunde, umsatzreport, umsatzreport adr
updated endcustomer reports, labels, inouts and logo
update fresh atrtibutes
fix conflict request_report.sql
migrationscript for request_report
# Conflicts:

#	de.metas.endcustomer.mf15/de.metas.endcustomer.mf15.base/src/main/jasperreports/de/metas/generics/report_logo.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/procurement_conditions/report.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/purchase/customs/report.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/purchase/customs/report_description.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/purchase/customs/report_details.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/purchase/customs/report_page_header.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/shippedinouts/report.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/shippedinouts/report_details.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/docs/sales/shippedinouts/report_details_hu.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/hubalancegeneral/report_details_tabular.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/kassenbuch/anfangsbestand.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/kassenbuch/endbestand.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/kassenbuch/report_details.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/kassenbuch/report_logo.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/kassenbuch/report_title.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/openitems_fibu/report_TabularView.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/openitems_fibu/report_details.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/umsatzprokunde/report_details.jrxml

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Direct_Costing_Raw_Data.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Direct_Costing_Raw_Data_Include_LastYear.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Direct_Costing_Raw_Data_Remainings.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Docs_HUBalance_Report_General_Day.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Docs_HUBalance_Report_General_Details.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Fresh_Account_Info_Report.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Fresh_Bank_Statement_Report.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Umsatzliste_BPartner_Report.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Umsatzliste_Report.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/fresh_Statistics.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/fresh_Statistics_Kg.sql

#	de.metas.fresh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/umsatzliste_bpartner_week_report.sql
migrationscripts with fix after merge
update sqls with isActive
fix migrationscripts
fix HU_Costprice_Function (see #552)
update acctBalanceToDate and HU_Costprice
@metas-ts metas-ts merged commit 69e1a18 into master Dec 16, 2016
@metas-ts metas-ts deleted the FRESH-668 branch December 16, 2016 06:29
metas-ts added a commit that referenced this pull request May 18, 2017
[#391](metasfresh/metasfresh-webui-api-legacy#391) role: besides menu tree, allow configuring the sub-tree to be used
[#706](metasfresh/metasfresh-webui-frontend-legacy#706) Manufacturing order - Issue HUs - wrong /quickActions call

me-45
metas-ts added a commit that referenced this pull request Dec 7, 2017
metasfresh/metasfresh-webui-api-legacy#706 port current MRP Product Info Window to the webui #706
metas-ts added a commit that referenced this pull request Dec 18, 2017
[#706](metasfresh/metasfresh-webui-api-legacy#706)
Port current MRP Product Info Window to the webui
[#755](metasfresh/metasfresh-webui-api-legacy#755)
Processes: support for parentViewSelectedIds and childViewSelectedIds
[#1427](metasfresh/metasfresh-webui-frontend-legacy#1427)
d3 errors on dashboard
[#2646](#2646) MRP
Product Info Just in Time
[#751](metasfresh/metasfresh-webui-api-legacy#751)
Picking Tray Clearing: packing HUs: Add to Transportation Order action
[#1437](metasfresh/metasfresh-webui-frontend-legacy#1437)
Language bug: The language in Settings is not respected
[#746](metasfresh/metasfresh-webui-api-legacy#746)
Picking Tray Clearing: Scan picking slot barcode filter
[#1455](metasfresh/metasfresh-webui-frontend-legacy#1455)
error when updating an attribute multiple times
[#747](metasfresh/metasfresh-webui-api-legacy#747)
Picking Tray Clearing: filter picking slots by Partner
[#1433](metasfresh/metasfresh-webui-frontend-legacy#1433)
Support Lookup view attributes
[#3211](#3211) Picking
Tray Clearing: right side view shall display only the HUs for current
BP/Location
[#1444](metasfresh/metasfresh-webui-frontend-legacy#1444)
Attributes are empty in material receipt candidate
[#3202](#3202) Error in
Paymentjournal Process/ Report in Payselection
[#3193](#3193) Improve
Window for manual OnHand Qty in WebUI
[#1448](metasfresh/metasfresh-webui-frontend-legacy#1448)
jenkins: fix current lint issues
[#1435](metasfresh/metasfresh-webui-frontend-legacy#1435)
Problem regarding multiple filters
[#1436](metasfresh/metasfresh-webui-frontend-legacy#1436)
Remove legacy docs
[#3169](#3169) Updating
PMM_Week availability trend fails
[#1206](metasfresh/metasfresh-webui-frontend-legacy#1206)
Use automatic code style enforcement
[#717](metasfresh/metasfresh-webui-api-legacy#717)
picking terminal: open HUs to pick shall display Best Before date and
Locator

me-45
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