- Now we can set a default text to print for every business document.

- Now we can filter print formats by company.
NeoRazorX · Oct 7, 2019 · d4fbdd5 · d4fbdd5
1 parent cc8a155
commit d4fbdd5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Core/Controller/ListFormatoDocumento.php b/Core/Controller/ListFormatoDocumento.php
@@ -53,6 +53,10 @@ protected function createFormatView($viewName = 'ListFormatoDocumento')
         $this->addSearchFields($viewName, ['titulo', 'texto']);
         $this->addOrderBy($viewName, ['id'], 'id');
         $this->addOrderBy($viewName, ['titulo'], 'title');
+
+        /// Filters
+        $companies = $this->codeModel->all('empresas', 'idempresa', 'nombrecorto');
+        $this->addFilterSelect($viewName, 'idempresa', 'company', 'idempresa', $companies);
     }
 
     /**
@@ -68,8 +72,8 @@ protected function createSequenceView($viewName = 'ListSecuenciaDocumento')
         $this->addOrderBy($viewName, ['numero'], 'number');
 
         /// Filters
-        $warehouses = $this->codeModel->all('empresas', 'idempresa', 'nombre');
-        $this->addFilterSelect($viewName, 'idempresa', 'company', 'idempresa', $warehouses);
+        $companies = $this->codeModel->all('empresas', 'idempresa', 'nombrecorto');
+        $this->addFilterSelect($viewName, 'idempresa', 'company', 'idempresa', $companies);
 
         $exercises = $this->codeModel->all('ejercicios', 'codejercicio', 'nombre');
         $this->addFilterSelect($viewName, 'codejercicio', 'exercise', 'codejercicio', $exercises);

diff --git a/Core/Lib/Export/MAILExport.php b/Core/Lib/Export/MAILExport.php
@@ -20,14 +20,15 @@
 
 use FacturaScripts\Core\Model\Base\BusinessDocument;
 use FacturaScripts\Core\Model\Base\ModelClass;
+use FacturaScripts\Dinamic\Lib\Export\PDFExport as ParentClass;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Description of MAILExport
  *
  * @author Carlos García Gómez <carlos@facturascripts.com>
  */
-class MAILExport extends PDFExport
+class MAILExport extends ParentClass
 {
 
     /**

diff --git a/Core/Lib/PDF/PDFDocument.php b/Core/Lib/PDF/PDFDocument.php
@@ -105,12 +105,15 @@ protected function getDivisaName($code): string
     protected function getDocumentFormat($model)
     {
         $documentFormat = new FormatoDocumento();
-        $where = [
-            new DataBaseWhere('tipodoc', $model->modelClassName()),
-            new DataBaseWhere('idempresa', $model->idempresa)
-        ];
-        foreach ($documentFormat->all($where, ['codserie' => 'DESC']) as $format) {
-            if ($format->codserie == $model->codserie || null === $format->codserie) {
+        $where = [new DataBaseWhere('idempresa', $model->idempresa)];
+        foreach ($documentFormat->all($where, ['tipodoc' => 'DESC', 'codserie' => 'DESC']) as $format) {
+            if ($format->tipodoc === $model->modelClassName() && $format->codserie === $model->codserie) {
+                return $format;
+            } elseif ($format->tipodoc === $model->modelClassName() && $format->codserie === null) {
+                return $format;
+            } elseif ($format->tipodoc === null && $format->codserie === $model->codserie) {
+                return $format;
+            } elseif ($format->tipodoc === null && $format->codserie === null) {
                 return $format;
             }
         }

diff --git a/Core/XMLView/EditFormatoDocumento.xml b/Core/XMLView/EditFormatoDocumento.xml
@@ -26,7 +26,7 @@
                 <widget type="text" fieldname="id" onclick="EditFormatoDocumento" />
             </column>
             <column name="doc-type" numcolumns="3" order="110">
-                <widget type="select" fieldname="tipodoc" translate="true" required="true">
+                <widget type="select" fieldname="tipodoc" translate="true">
                     <values title="customer-estimation">PresupuestoCliente</values>
                     <values title="customer-order">PedidoCliente</values>
                     <values title="customer-delivery-note">AlbaranCliente</values>