From 697dee56f43ab9e79479cb7a9c4c278a80aaaf43 Mon Sep 17 00:00:00 2001 From: Philipp Fehr Date: Tue, 2 Jan 2024 12:27:52 +0100 Subject: [PATCH] Release to master (#664) * Fix invoice position description (#646) * Merge Develop (#596) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Merge (#598) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Merge (#604) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Merge (#606) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * qr-code fix (#637) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * . * . * Cleaner Code * . * String Concat instead of interpolation * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * . * Fix qr code input (#635) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Correct Address --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: Simone Fuchs Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> * Fix QR-Bills (#640) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Format Amount --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> * Choose Project Position Description over Service Description --------- Co-authored-by: dacin21 Co-authored-by: Philipp Fehr Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> * Fix invoice position description new (#650) * Merge Develop (#596) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Merge (#598) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Merge (#604) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Merge (#606) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * qr-code fix (#637) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * . * . * Cleaner Code * . * String Concat instead of interpolation * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * . * Fix qr code input (#635) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Correct Address --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: Simone Fuchs Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> * Fix QR-Bills (#640) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Format Amount --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> * Fix w/o whitespace * Show Description if present. --------- Co-authored-by: dacin21 Co-authored-by: Philipp Fehr Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> * Fix invoice position description new (#651) * Merge Develop (#596) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Merge (#598) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Merge (#604) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Merge (#606) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * qr-code fix (#637) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * . * . * Cleaner Code * . * String Concat instead of interpolation * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * . * Fix qr code input (#635) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Correct Address --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: Simone Fuchs Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> * Fix QR-Bills (#640) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Format Amount --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> * Fix w/o whitespace * Show Description if present. * Check for empty description --------- Co-authored-by: dacin21 Co-authored-by: Philipp Fehr Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> * Fix invoice position description new (#655) * Merge Develop (#596) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Merge (#598) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Merge (#604) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Merge (#606) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * qr-code fix (#637) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * . * . * Cleaner Code * . * String Concat instead of interpolation * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * . * Fix qr code input (#635) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Correct Address --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: Simone Fuchs Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> * Fix QR-Bills (#640) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Format Amount --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> * Fix w/o whitespace * Show Description if present. * Check for empty description * Prefer description over service name. --------- Co-authored-by: dacin21 Co-authored-by: Philipp Fehr Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> * Fix invoice position description new (#656) * Merge Develop (#596) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Merge (#598) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Merge (#604) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Merge (#606) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * qr-code fix (#637) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * . * . * Cleaner Code * . * String Concat instead of interpolation * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * . * Fix qr code input (#635) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Correct Address --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: Simone Fuchs Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> * Fix QR-Bills (#640) * Update README.md (#593) * #594 Fix Service Form (#595) * #594 Fix Service Form * Fixed comment * Fixed pdf error (#597) * Added percentages when there are multiple project_categories (#603) * Project service hour report improvement project categories (#605) * Added percentages when there are multiple project_categories * New alternative project_service_hour_report * Correct QR-Code. Line 2 can have 16 chars max. * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Fix qr code input (#632) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Correct Address * Fix qr code input (#633) * Fix QR-Code: Line 2 can have max. 16 chars. Conflicts with cases where a company name and a person is addressed. * Format Amount --------- Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> * Fix w/o whitespace * Show Description if present. * Check for empty description * Prefer description over service name. * Service Description depending on entries. --------- Co-authored-by: dacin21 Co-authored-by: Philipp Fehr Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> * CI/CD (#659) * Fix CD (#660) * Update cd.yml * Update cd.yml * Don't shallow checkout * Split cd (#661) * Add new 2024 vat options to VatSelector (#658) * Change 7.7 to 8.1 (#663) --------- Co-authored-by: fuchsswo <128032274+fuchsswo@users.noreply.github.com> Co-authored-by: dacin21 Co-authored-by: floerb <88648569+floerb@users.noreply.github.com> Co-authored-by: stiftungswo <33512282+swoadmin@users.noreply.github.com> --- frontend/src/views/invoices/InvoiceForm.tsx | 2 +- frontend/src/views/offers/OfferForm.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/invoices/InvoiceForm.tsx b/frontend/src/views/invoices/InvoiceForm.tsx index baf336ea..5d0f170c 100644 --- a/frontend/src/views/invoices/InvoiceForm.tsx +++ b/frontend/src/views/invoices/InvoiceForm.tsx @@ -316,7 +316,7 @@ export default class InvoiceForm extends React.Component { component={VatSelect} name={'fixed_price_vat'} label={intl.formatMessage({id: 'view.offer.form.vat_rate'})} - placeholder={'7.7%'} + placeholder={'8.1%'} disabled={!invoice.fixed_price} /> diff --git a/frontend/src/views/offers/OfferForm.tsx b/frontend/src/views/offers/OfferForm.tsx index 4317b664..a816607b 100644 --- a/frontend/src/views/offers/OfferForm.tsx +++ b/frontend/src/views/offers/OfferForm.tsx @@ -375,7 +375,7 @@ class OfferForm extends React.Component { component={VatSelect} name={'fixed_price_vat'} label={intl.formatMessage({id: 'view.offer.form.vat_rate'})} - placeholder={'7.7%'} + placeholder={'8.1%'} disabled={!offer.fixed_price || locked} />