ascii_invoicer 2.5.10 → 2.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695e518f05626d7d49ff52e39a29005057357ab2
-  data.tar.gz: 8a17c19f7331d0b5ae76babf591ec2d2d975ef50
+  metadata.gz: ce360fc0c1e11021821c0a3e6bfad33bd5fda047
+  data.tar.gz: 2ea15b30cef7fcb4ffb52692eec3d71bdc80bde9
 SHA512:
-  metadata.gz: 6f6a9bf9d506f143fa8d1fa50844575cbda4c1122f608b02c7d6567ce8eabe5db376eae9c5b8fa46cea4890da48595b7913b82877c03d555d1f8d4a8881d0117
-  data.tar.gz: aaf28dd551e743f293538c9cf450e74b8c792b01a93e543d1ebae784b43a4f0a5b27288c2203812d40a889f54a19244ee8562bfc7441034a4f923344c0d04838
+  metadata.gz: 08ef97d95038bfe6d46a87eb63ef80077f804318c1318f994ad72fc1ff703f112ef9be5688f46346e93a50b3d7fc63b3b3c6fd4dad21306629018dfea20a975a
+  data.tar.gz: 3ec4c58d0247f531f8db6aa623ce387445f23a2abb174d25674df601d2813ca41aaa6fb2efd48634a443ae3668d857e5d2d34ce4fb66a00b91ee90382aa17a9e

data/bin/ascii

@@ -7,7 +7,6 @@ require 'thor'
 require 'paint'
 require 'luigi'
 require 'logger'
-require 'bundler/setup'
 require 'textboxes'
 require 'hash-graft'
 

data/latex/ascii-brief.cls

@@ -56,7 +56,7 @@
 \renewcommand*\familydefault{\sfdefault} %% Only if the base font of the document is to be sans serif
 
 \def \sprache{ngerman}
-\newcommand{\leadingzero}[1]{\ifnum #1<10 0\the#1\else\the#1\fi}
+\newcommand{\leadingzero}[1]{\ifnum #1<10 0\the#1\else\the#1\fi}       
 
 \def \telefontex          {{ \footnotesize  Telefon\/:        }}
 \def \telefaxtext         {{ \footnotesize  Telefax\/:        }}
@@ -75,13 +75,13 @@
 
 \def \rechnungsnummer{}
 \def \rechnung{ R\the\year-\rechnungsnummer }
-
+     
 \def \angebotltext{\footnotesize{Angebot}}
 %\de f\angebot{A\the\year\leadingzero{\month}\leadingzero{\day}}
 \def \angebot{}
-
+     
 \def \unserzeichentext{\footnotesize{Unser Zeichen}}
-
+     
 \def \datumtext{\footnotesize{Datum}}
 \def \datum{\number\day.~\ifcase\month\or Januar\or Februar\or
   M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or
@@ -220,34 +220,34 @@
 
   %
   % Veranstaltung - Rechnungsnummer - Angebot - Datum
-
+  
   \ifx \veranstaltung\empty
-  \makebox[45.5mm][l]{}
+    \makebox[45.5mm][l]{}
   \else
   \makebox[45.5mm][l]{\veranstaltungtext}
   \fi
-  \if \rechnungsnummer\empty
-    \makebox[55.0mm][l]{}
-  \else
-    \makebox[55.0mm][l]{\rechnungstext}
-  \fi
   \if \angebotmanuel\empty
-    \makebox[20.0mm][r]{}
+    \makebox[20.0mm][r]{} 
   \else
-    \makebox[20.0mm][r]{\angebotltext}
-  \fi
-  \makebox[37.0mm][r]{\datumtext} \\ % ZEILENUMBRUCH
-  \makebox[45.5mm][l]{\veranstaltung}
+    \makebox[20.0mm][r]{\angebotltext} 
+  \fi 
   \if \rechnungsnummer\empty
     \makebox[55.0mm][l]{}
   \else
-    \makebox[55.0mm][l]{\rechnungsnummer}
-  \fi
+    \makebox[55.0mm][l]{\rechnungstext} 
+  \fi 
+  \makebox[37.0mm][r]{\datumtext} \\ % ZEILENUMBRUCH
+  \makebox[45.5mm][l]{\veranstaltung}  
   \if \angebotmanuel\empty
-    \makebox[20.0mm][r]{\angebot}
+    \makebox[20.0mm][r]{\angebot} 
   \else
-    \makebox[20.0mm][r]{\angebotmanuel}
-  \fi
+    \makebox[20.0mm][r]{\angebotmanuel} 
+  \fi 
+  \if \rechnungsnummer\empty
+    \makebox[55.0mm][l]{} 
+  \else 
+    \makebox[55.0mm][l]{\rechnungsnummer} 
+  \fi 
   \makebox[37.0mm][r]{\datum} \par
 
     \vspace{8mm}
@@ -284,12 +284,12 @@
   \renewcommand{\baselinestretch}{1.0}
   \ifcase \@ptsize\relax \normalsize \or \small \or \footnotesize \fi
   \headheight16pt\headsep63mm
-
+  
   %% kopf
   \def\@oddhead{
     \unitlength1mm
     \begin{picture}(0,0)
-
+    
       \put(-13, 6){\parbox{180mm}{\huge \ifklassisch \textsl{\quad\name}
           \else {\quad\name} \fi}
       }
@@ -301,7 +301,7 @@
       \put(-10, -8){\parbox{180mm}{\large \ifklassisch \textsl{\quad\fakultaet \textbullet \ort}
           \else {\quad\fakultaet \textbullet \ort} \fi}
       }
-
+      
       %\put(-9, 4){\parbox{180mm}{\hfill \normalsize \ifklassisch \textsl{
       %      \begin{tabular}{r} \strasse \quad \\ \ifx \zusatz\empty \else
       %        \zusatz \quad \\ \fi \ort \quad \ifx \land\empty \else \\
@@ -310,11 +310,11 @@
       %        \zusatz \quad \\ \fi \ort \quad \ifx \land\empty \else \\
       %        \land \quad \fi \end{tabular}} \fi}
       %}
-
+      
       %\iftrennlinien
       %  \put(-9,-7){\rule{180mm}{0.5pt}}
       %\fi
-
+      
       \iflochermarke
         \put(-20,- 130.50){\line(1,0){4}}
       \fi
@@ -356,7 +356,7 @@
     \end{picture}
     \hfill
   }
-
+  
   %%fuss
   \def\@oddfoot{\unitlength1mm
     \begin{picture}(0,0)

data/lib/ascii_invoicer/version.rb

@@ -1,3 +1,3 @@
 module AsciiInvoicer
-  VERSION = '2.5.10'
+  VERSION = '2.5.11'
 end

data/templates/default.yml.erb

@@ -1,24 +1,24 @@
 --- # ascii invoicer document  (version: <%= version %>, template: <%= template %>)
-format: 2.4.0
-created: <%= Date.today.strftime "%d.%m.%Y" %>
 
-client: 
-  title:     Herr # Frau, Professor, Professorin
-  first_name: John
-  last_name:  Doe
+client:
+  title:      Herr # Frau # Professor # Professorin
+  first_name:
+  last_name:
 
-  email: jon.doe@example.com
-  address: | 
-    John Doe
+  email:
+  address: |
+    Technische Universität Dresden
+    Fakultät Informatik
+    ....
     Nöthnitzerstraße 46
     01187 Dresden
 
-event: 
+event:
   name: "<%= project_name %>"
   location: # might be a list
   dates:
   - begin: <%= (Date.today+ 14).strftime "%d.%m.%Y" %> # bezieht sich auf die veranstaltung selbst
-    #end: 
+    #end:
     times:
     -  begin: "9:00"
        end:   "17:00"
@@ -31,8 +31,9 @@ offer:
 
 invoice:
   number: #27
-  date: #leave empty for auto date
-  payed_date:
+  date:  #required
+  payed_date: #required
+  official: # use instead of
 
 cataloge:
   product: &kaffee       { name: Kaffee          , price: 2.5  , unit: 1l  }
@@ -49,20 +50,21 @@ cataloge:
   product: &obstplatte   { name: Obstplatte      , price: 30.00 , unit: stk }
 
 products:
+  *kaffee:
+    amount: 4
+    sold:   5
 
-  *kaffee: { amount: 4, sold:   5 }
   *wasser_gross:
     amount: 4
-    returned:   3
+
   *kekse:
     amount: 4
-    sold: 2
 
-hours: 
+hours:
   salary: 8.00
   caterers:
     "unknown" : 0 #Stunden
-    
+
 manager: <%= manager_name %>
 
 #canceled: yes
@@ -71,4 +73,8 @@ manager: <%= manager_name %>
 
 #messages: # read default-settings.yml on how to overwrite
 
+invoicer_version: <%= version %>
+template: <%= template %>
+format: 2.4.1
+created: <%= Date.today.strftime "%d.%m.%Y" %>
 ...

data/templates/document.tex.erb

@@ -31,12 +31,13 @@
 \Postvermerk         {}
 \Adresse             {<%= @data[:client][:address].gsub("\n","\\newline ") %>}
 
-\Betreff             {<%= @data[:messages][document_type][0] %>} %% [Angebot|Rechnung]
+\Betreff             {<%= @data[:messages][document_type][0] %>
+                      <%= "\\newline #{@data[:invoice][:official]}" unless @data[:invoice][:official].nil?  %>} %% [Angebot|Rechnung]
 
 \Datum               {<%= @data[type][:date] %>}
-\AngebotManuel       {<%= @data[:offer][:number] if type == :offer %>} %% Manuel ueberschreibbar ansonsten automatisch heute
+\AngebotManuel       {<%= @data[:offer][:number] %>} %% Manuel ueberschreibbar ansonsten automatisch heute
 \Veranstaltung       {<%= @data[:event][:name] %>}
-\RechnungsNummer     {<%= @data[:invoice][:longnumber] %>} %% bei Angeboten leer lassen
+\RechnungsNummer     {<%= @data[:invoice][:longnumber] if type == :invoice %>} %% bei Angeboten leer lassen
 \Anrede              {<%= @data[:client][:addressing] %>,}
 \Gruss               {<%= @data[:messages][:signature] %> <%= @data[:signature] %>}{1cm}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_invoicer
 version: !ruby/object:Gem::Version
-  version: 2.5.10
+  version: 2.5.11
 platform: ruby
 authors:
 - Hendrik Sollich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ascii-invoicer