Merge branch 'master' into 'develop'

Master(efernandez) See merge request !12

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !12
Eric Fernandez
2 parents a2a93032aa 43504dcd53
Showing 2 changed files Show diff stats
src/js/app.js
src/views/cabecera.html
@@ -6,6 +6,7 @@ angular.module(&#39;focaCabeceraFacturador&#39;, [])
             titulo: '<',
             numero: '<',
             fecha: '=',
-            busqueda: '<'
+            busqueda: '<',
+            fechaDisabled: '<'
         }
     });
@@ -41,7 +41,7 @@
                                 on-open-focus="false"
                                 ng-focus="datepickerOpen = true"
                             />
-                            <button
+                            <button ng-if="!$ctrl.fechaDisabled"
                                 class="btn btn-xs btn-outline-light float-right"
                                 ng-click="datepickerAbierto = true"
                             >
...	...	@@ -6,6 +6,7 @@ angular.module('focaCabeceraFacturador', [])
6	6	titulo: '<',
7	7	numero: '<',
8	8	fecha: '=',
9		- busqueda: '<'
	9	+ busqueda: '<',
	10	+ fechaDisabled: '<'
10	11	}
11	12	});
...	...	@@ -41,7 +41,7 @@
41	41	on-open-focus="false"
42	42	ng-focus="datepickerOpen = true"
43	43	/>
44		- <button
	44	+ <button ng-if="!$ctrl.fechaDisabled"
45	45	class="btn btn-xs btn-outline-light float-right"
46	46	ng-click="datepickerAbierto = true"
47	47	>