Merge remote-tracking branch 'origin/master'

thegreenter · Feb 17, 2019 · 7dafa09 · 7dafa09
2 parents f633ea7 + 30781c3
commit 7dafa09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 dist: trusty
 php:
   - 5.6
-  - 7.0
+  - 7.1
 
 before_script:
   - composer self-update

diff --git a/src/Report/Templates/invoice.html.twig b/src/Report/Templates/invoice.html.twig
@@ -87,6 +87,7 @@
                     <tr>
                         <td width="60%" align="left">
                             <strong>Fecha Emisión: </strong>  {{ doc.fechaEmision|date('d/m/Y') }}
+                            {% if doc.fechaEmision|date('H:i:s') != '00:00:00' %} {{ doc.fechaEmision|date('H:i:s') }} {% endif %}
                             {% if doc.fecVencimiento is defined and doc.fecVencimiento %}
                             <br><br><strong>Fecha Vencimiento: </strong>  {{ doc.fecVencimiento|date('d/m/Y') }}
                             {% endif %}
@@ -263,12 +264,12 @@
                             </tr>
                             {% endif %}
                             <tr>
-                                <td align="right"><strong>IGV:</strong></td>
+                                <td align="right"><strong>I.G.V. {% if params.user.numIGV is defined %} {{ params.user.numIGV }}{% endif %}%:</strong></td>
                                 <td width="120" align="right"><span>{{ moneda }}  {{ doc.mtoIGV|n_format }}</span></td>
                             </tr>
                             {% if doc.mtoISC %}
                             <tr>
-                                <td align="right"><strong>ISC:</strong></td>
+                                <td align="right"><strong>I.S.C.:</strong></td>
                                 <td width="120" align="right"><span>{{ moneda }}  {{ doc.mtoISC|n_format }}</span></td>
                             </tr>
                             {% endif %}
@@ -333,4 +334,4 @@
         </td>
     </tr>
     </tbody></table>
-</body></html>
+</body></html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: required @@
     dist: trusty
     php:
       - 5.6
-      - 7.0
+      - 7.1
     before_script:
       - composer self-update
@@ Expand Down @@