Skip to content

Commit

Permalink
Release to master (#664)
Browse files Browse the repository at this point in the history 
* 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 <[email protected]>
Co-authored-by: Simone Fuchs <[email protected]>
Co-authored-by: fuchsswo <[email protected]>

* 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 <[email protected]>

* Choose Project Position Description over Service Description

---------

Co-authored-by: dacin21 <[email protected]>
Co-authored-by: Philipp Fehr <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simone Fuchs <[email protected]>
Co-authored-by: fuchsswo <[email protected]>

* 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 <[email protected]>

* Fix w/o whitespace

* Show Description if present.

---------

Co-authored-by: dacin21 <[email protected]>
Co-authored-by: Philipp Fehr <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simone Fuchs <[email protected]>
Co-authored-by: fuchsswo <[email protected]>

* 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 <[email protected]>

* Fix w/o whitespace

* Show Description if present.

* Check for empty description

---------

Co-authored-by: dacin21 <[email protected]>
Co-authored-by: Philipp Fehr <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simone Fuchs <[email protected]>
Co-authored-by: fuchsswo <[email protected]>

* 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 <[email protected]>

* Fix w/o whitespace

* Show Description if present.

* Check for empty description

* Prefer description over service name.

---------

Co-authored-by: dacin21 <[email protected]>
Co-authored-by: Philipp Fehr <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simone Fuchs <[email protected]>
Co-authored-by: fuchsswo <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Philipp Fehr <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>

* 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 <[email protected]>
Co-authored-by: dacin21 <[email protected]>
Co-authored-by: floerb <[email protected]>
Co-authored-by: stiftungswo <[email protected]>
  • Loading branch information
@TheFehr @fuchsswo
@dacin21 @floerb @swoadmin
5 people authored Jan 2, 2024
1 parent 496463d commit 697dee5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frontend/src/views/invoices/InvoiceForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export default class InvoiceForm extends React.Component<Props> {
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}
/>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/offers/OfferForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ class OfferForm extends React.Component<Props> {
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}
/>
</Grid>
Expand Down

0 comments on commit 697dee5

Please sign in to comment.