Skip to content

Develop #1

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

Merged
ndu2 merged 5 commits into from
Feb 23, 2021
Merged

Develop #1

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35b6926
updated commander, open and markdown-pdf
Feb 23, 2021
843339e
updated packages
Feb 23, 2021
da0f40a
add invoice
Feb 23, 2021
f16c4e2
invoice
Feb 23, 2021
8904888
added mwst to total line
Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
invoice
  • Loading branch information
Andreas Müller committed Feb 23, 2021
commit f16c4e2345f60ea1c18bdbcd011c643138b18891
3 changes: 0 additions & 3 deletions src/gtt-report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,13 @@ config
.set('type', program.opts().type)
.set('subgroups', program.opts().subgroups)
.set('_verbose', program.opts().verbose)
<<<<<<< Updated upstream
=======
.set('invoiceTitle', program.opts().invoiceTitle)
.set('invoiceAddress', program.opts().invoiceAddress)
.set('invoiceCurrency', program.opts().invoiceCurrency)
.set('invoiceCurrencyPerHour', program.opts().invoiceCurrencyPerHour)
.set('invoiceVAT', program.opts().invoiceVAT)
.set('invoiceDate', program.opts().invoiceDate)
.set('invoiceCurrencyMaxUnit', program.opts().invoiceCurrencyMaxUnit)
>>>>>>> Stashed changes
.set('_createDump', program.opts().output === 'dump');

// date shortcuts
Expand Down