alxarafe /
alixar
@@ -40,129 +40,129 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0) |
| 42 | 42 | { |
| 43 | - global $db, $conf, $langs; |
|
| 43 | + global $db, $conf, $langs; |
|
| 44 | 44 | |
| 45 | - $idprod=$line->fk_product; |
|
| 46 | - $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:'')); |
|
| 47 | - $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:'')); |
|
| 48 | - $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders |
|
| 49 | - $note=(! empty($line->note)?$line->note:''); |
|
| 45 | + $idprod=$line->fk_product; |
|
| 46 | + $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:'')); |
|
| 47 | + $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:'')); |
|
| 48 | + $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders |
|
| 49 | + $note=(! empty($line->note)?$line->note:''); |
|
| 50 | 50 | |
| 51 | - if ($issupplierline) $prodser = new ProductFournisseur($db); |
|
| 52 | - else $prodser = new Product($db); |
|
| 51 | + if ($issupplierline) $prodser = new ProductFournisseur($db); |
|
| 52 | + else $prodser = new Product($db); |
|
| 53 | 53 | |
| 54 | - if ($idprod) |
|
| 55 | - { |
|
| 56 | - $prodser->fetch($idprod); |
|
| 57 | - // If a predefined product and multilang and on other lang, we renamed label with label translated |
|
| 58 | - if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) |
|
| 59 | - { |
|
| 60 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 61 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 62 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 63 | - } |
|
| 64 | - } |
|
| 54 | + if ($idprod) |
|
| 55 | + { |
|
| 56 | + $prodser->fetch($idprod); |
|
| 57 | + // If a predefined product and multilang and on other lang, we renamed label with label translated |
|
| 58 | + if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) |
|
| 59 | + { |
|
| 60 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 61 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 62 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - // Description short of product line |
|
| 67 | - $libelleproduitservice=$label; |
|
| 66 | + // Description short of product line |
|
| 67 | + $libelleproduitservice=$label; |
|
| 68 | 68 | |
| 69 | - // Description long of product line |
|
| 70 | - if ($desc && ($desc != $label)) |
|
| 71 | - { |
|
| 72 | - if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) |
|
| 73 | - { |
|
| 74 | - $discount=new DiscountAbsolute($db); |
|
| 75 | - $discount->fetch($line->fk_remise_except); |
|
| 76 | - $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 77 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref); |
|
| 78 | - } |
|
| 79 | - elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) |
|
| 80 | - { |
|
| 81 | - $discount=new DiscountAbsolute($db); |
|
| 82 | - $discount->fetch($line->fk_remise_except); |
|
| 83 | - $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 84 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref); |
|
| 85 | - // Add date of deposit |
|
| 86 | - if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; |
|
| 87 | - } |
|
| 88 | - elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) |
|
| 89 | - { |
|
| 90 | - $discount=new DiscountAbsolute($db); |
|
| 91 | - $discount->fetch($line->fk_remise_except); |
|
| 92 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source); |
|
| 93 | - } |
|
| 94 | - elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) |
|
| 95 | - { |
|
| 96 | - $discount=new DiscountAbsolute($db); |
|
| 97 | - $discount->fetch($line->fk_remise_except); |
|
| 98 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source); |
|
| 99 | - } |
|
| 100 | - else |
|
| 101 | - { |
|
| 102 | - if ($idprod) |
|
| 103 | - { |
|
| 104 | - if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 105 | - } |
|
| 106 | - else |
|
| 107 | - { |
|
| 108 | - $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 109 | - } |
|
| 110 | - } |
|
| 111 | - } |
|
| 69 | + // Description long of product line |
|
| 70 | + if ($desc && ($desc != $label)) |
|
| 71 | + { |
|
| 72 | + if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) |
|
| 73 | + { |
|
| 74 | + $discount=new DiscountAbsolute($db); |
|
| 75 | + $discount->fetch($line->fk_remise_except); |
|
| 76 | + $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 77 | + $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref); |
|
| 78 | + } |
|
| 79 | + elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) |
|
| 80 | + { |
|
| 81 | + $discount=new DiscountAbsolute($db); |
|
| 82 | + $discount->fetch($line->fk_remise_except); |
|
| 83 | + $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 84 | + $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref); |
|
| 85 | + // Add date of deposit |
|
| 86 | + if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; |
|
| 87 | + } |
|
| 88 | + elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) |
|
| 89 | + { |
|
| 90 | + $discount=new DiscountAbsolute($db); |
|
| 91 | + $discount->fetch($line->fk_remise_except); |
|
| 92 | + $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source); |
|
| 93 | + } |
|
| 94 | + elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) |
|
| 95 | + { |
|
| 96 | + $discount=new DiscountAbsolute($db); |
|
| 97 | + $discount->fetch($line->fk_remise_except); |
|
| 98 | + $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source); |
|
| 99 | + } |
|
| 100 | + else |
|
| 101 | + { |
|
| 102 | + if ($idprod) |
|
| 103 | + { |
|
| 104 | + if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 105 | + } |
|
| 106 | + else |
|
| 107 | + { |
|
| 108 | + $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 109 | + } |
|
| 110 | + } |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - // If line linked to a product |
|
| 114 | - if ($idprod) |
|
| 115 | - { |
|
| 116 | - // On ajoute la ref |
|
| 117 | - if ($prodser->ref) |
|
| 118 | - { |
|
| 119 | - $prefix_prodserv = ""; |
|
| 120 | - $ref_prodserv = ""; |
|
| 121 | - if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this |
|
| 122 | - { |
|
| 123 | - if ($prodser->isService()) |
|
| 124 | - { |
|
| 125 | - $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." "; |
|
| 126 | - } |
|
| 127 | - else |
|
| 128 | - { |
|
| 129 | - $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." "; |
|
| 130 | - } |
|
| 131 | - } |
|
| 113 | + // If line linked to a product |
|
| 114 | + if ($idprod) |
|
| 115 | + { |
|
| 116 | + // On ajoute la ref |
|
| 117 | + if ($prodser->ref) |
|
| 118 | + { |
|
| 119 | + $prefix_prodserv = ""; |
|
| 120 | + $ref_prodserv = ""; |
|
| 121 | + if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this |
|
| 122 | + { |
|
| 123 | + if ($prodser->isService()) |
|
| 124 | + { |
|
| 125 | + $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." "; |
|
| 126 | + } |
|
| 127 | + else |
|
| 128 | + { |
|
| 129 | + $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." "; |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - if (empty($hideref)) |
|
| 134 | - { |
|
| 135 | - if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref |
|
| 136 | - else $ref_prodserv = $prodser->ref; // Show local ref only |
|
| 133 | + if (empty($hideref)) |
|
| 134 | + { |
|
| 135 | + if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref |
|
| 136 | + else $ref_prodserv = $prodser->ref; // Show local ref only |
|
| 137 | 137 | |
| 138 | - $ref_prodserv .= " - "; |
|
| 139 | - } |
|
| 138 | + $ref_prodserv .= " - "; |
|
| 139 | + } |
|
| 140 | 140 | |
| 141 | - $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice; |
|
| 142 | - } |
|
| 143 | - } |
|
| 141 | + $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice; |
|
| 142 | + } |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | - if (! empty($line->date_start) || ! empty($line->date_end)) |
|
| 146 | - { |
|
| 147 | - $format='day'; |
|
| 148 | - // Show duration if exists |
|
| 149 | - if ($line->date_start && $line->date_end) |
|
| 150 | - { |
|
| 151 | - $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 152 | - } |
|
| 153 | - if ($line->date_start && ! $line->date_end) |
|
| 154 | - { |
|
| 155 | - $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')'; |
|
| 156 | - } |
|
| 157 | - if (! $line->date_start && $line->date_end) |
|
| 158 | - { |
|
| 159 | - $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 160 | - } |
|
| 161 | - //print '>'.$outputlangs->charset_output.','.$period; |
|
| 162 | - $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period); |
|
| 163 | - //print $libelleproduitservice; |
|
| 164 | - } |
|
| 145 | + if (! empty($line->date_start) || ! empty($line->date_end)) |
|
| 146 | + { |
|
| 147 | + $format='day'; |
|
| 148 | + // Show duration if exists |
|
| 149 | + if ($line->date_start && $line->date_end) |
|
| 150 | + { |
|
| 151 | + $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 152 | + } |
|
| 153 | + if ($line->date_start && ! $line->date_end) |
|
| 154 | + { |
|
| 155 | + $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')'; |
|
| 156 | + } |
|
| 157 | + if (! $line->date_start && $line->date_end) |
|
| 158 | + { |
|
| 159 | + $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 160 | + } |
|
| 161 | + //print '>'.$outputlangs->charset_output.','.$period; |
|
| 162 | + $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period); |
|
| 163 | + //print $libelleproduitservice; |
|
| 164 | + } |
|
| 165 | 165 | |
| 166 | - return $libelleproduitservice; |
|
| 166 | + return $libelleproduitservice; |
|
| 167 | 167 | } |
| 168 | 168 | |
@@ -38,15 +38,15 @@ discard block |
||
| 38 | 38 | * @param int $issupplierline Is it a line for a supplier object ? |
| 39 | 39 | * @return string String with line |
| 40 | 40 | */ |
| 41 | -function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0) |
|
| 41 | +function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0) |
|
| 42 | 42 | { |
| 43 | 43 | global $db, $conf, $langs; |
| 44 | 44 | |
| 45 | - $idprod=$line->fk_product; |
|
| 46 | - $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:'')); |
|
| 47 | - $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:'')); |
|
| 48 | - $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders |
|
| 49 | - $note=(! empty($line->note)?$line->note:''); |
|
| 45 | + $idprod = $line->fk_product; |
|
| 46 | + $label = (!empty($line->label) ? $line->label : (!empty($line->libelle) ? $line->libelle : '')); |
|
| 47 | + $desc = (!empty($line->desc) ? $line->desc : (!empty($line->description) ? $line->description : '')); |
|
| 48 | + $ref_supplier = (!empty($line->ref_supplier) ? $line->ref_supplier : (!empty($line->ref_fourn) ? $line->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders |
|
| 49 | + $note = (!empty($line->note) ? $line->note : ''); |
|
| 50 | 50 | |
| 51 | 51 | if ($issupplierline) $prodser = new ProductFournisseur($db); |
| 52 | 52 | else $prodser = new Product($db); |
@@ -55,57 +55,57 @@ discard block |
||
| 55 | 55 | { |
| 56 | 56 | $prodser->fetch($idprod); |
| 57 | 57 | // If a predefined product and multilang and on other lang, we renamed label with label translated |
| 58 | - if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) |
|
| 58 | + if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) |
|
| 59 | 59 | { |
| 60 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 61 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 62 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 60 | + if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label = $prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 61 | + if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 62 | + if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // Description short of product line |
| 67 | - $libelleproduitservice=$label; |
|
| 67 | + $libelleproduitservice = $label; |
|
| 68 | 68 | |
| 69 | 69 | // Description long of product line |
| 70 | 70 | if ($desc && ($desc != $label)) |
| 71 | 71 | { |
| 72 | 72 | if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) |
| 73 | 73 | { |
| 74 | - $discount=new DiscountAbsolute($db); |
|
| 74 | + $discount = new DiscountAbsolute($db); |
|
| 75 | 75 | $discount->fetch($line->fk_remise_except); |
| 76 | - $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 77 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref); |
|
| 76 | + $sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source; |
|
| 77 | + $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref); |
|
| 78 | 78 | } |
| 79 | 79 | elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) |
| 80 | 80 | { |
| 81 | - $discount=new DiscountAbsolute($db); |
|
| 81 | + $discount = new DiscountAbsolute($db); |
|
| 82 | 82 | $discount->fetch($line->fk_remise_except); |
| 83 | - $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
|
| 84 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref); |
|
| 83 | + $sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source; |
|
| 84 | + $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref); |
|
| 85 | 85 | // Add date of deposit |
| 86 | - if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; |
|
| 86 | + if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')'; |
|
| 87 | 87 | } |
| 88 | 88 | elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) |
| 89 | 89 | { |
| 90 | - $discount=new DiscountAbsolute($db); |
|
| 90 | + $discount = new DiscountAbsolute($db); |
|
| 91 | 91 | $discount->fetch($line->fk_remise_except); |
| 92 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source); |
|
| 92 | + $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source); |
|
| 93 | 93 | } |
| 94 | 94 | elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) |
| 95 | 95 | { |
| 96 | - $discount=new DiscountAbsolute($db); |
|
| 96 | + $discount = new DiscountAbsolute($db); |
|
| 97 | 97 | $discount->fetch($line->fk_remise_except); |
| 98 | - $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source); |
|
| 98 | + $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source); |
|
| 99 | 99 | } |
| 100 | 100 | else |
| 101 | 101 | { |
| 102 | 102 | if ($idprod) |
| 103 | 103 | { |
| 104 | - if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 104 | + if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc); |
|
| 105 | 105 | } |
| 106 | 106 | else |
| 107 | 107 | { |
| 108 | - $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 108 | + $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc); |
|
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | { |
| 119 | 119 | $prefix_prodserv = ""; |
| 120 | 120 | $ref_prodserv = ""; |
| 121 | - if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this |
|
| 121 | + if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this |
|
| 122 | 122 | { |
| 123 | 123 | if ($prodser->isService()) |
| 124 | 124 | { |
@@ -132,34 +132,34 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | if (empty($hideref)) |
| 134 | 134 | { |
| 135 | - if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref |
|
| 135 | + if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref |
|
| 136 | 136 | else $ref_prodserv = $prodser->ref; // Show local ref only |
| 137 | 137 | |
| 138 | 138 | $ref_prodserv .= " - "; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice; |
|
| 141 | + $libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice; |
|
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if (! empty($line->date_start) || ! empty($line->date_end)) |
|
| 145 | + if (!empty($line->date_start) || !empty($line->date_end)) |
|
| 146 | 146 | { |
| 147 | - $format='day'; |
|
| 147 | + $format = 'day'; |
|
| 148 | 148 | // Show duration if exists |
| 149 | 149 | if ($line->date_start && $line->date_end) |
| 150 | 150 | { |
| 151 | - $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 151 | + $period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($line->date_start, $format, false, $outputlangs), dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 152 | 152 | } |
| 153 | - if ($line->date_start && ! $line->date_end) |
|
| 153 | + if ($line->date_start && !$line->date_end) |
|
| 154 | 154 | { |
| 155 | - $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')'; |
|
| 155 | + $period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($line->date_start, $format, false, $outputlangs)).')'; |
|
| 156 | 156 | } |
| 157 | - if (! $line->date_start && $line->date_end) |
|
| 157 | + if (!$line->date_start && $line->date_end) |
|
| 158 | 158 | { |
| 159 | - $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 159 | + $period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($line->date_end, $format, false, $outputlangs)).')'; |
|
| 160 | 160 | } |
| 161 | 161 | //print '>'.$outputlangs->charset_output.','.$period; |
| 162 | - $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period); |
|
| 162 | + $libelleproduitservice = dol_concatdesc($libelleproduitservice, $period); |
|
| 163 | 163 | //print $libelleproduitservice; |
| 164 | 164 | } |
| 165 | 165 | |
@@ -48,8 +48,11 @@ discard block |
||
| 48 | 48 | $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:'')); // TODO Not yet saved for supplier invoices, only supplier orders |
| 49 | 49 | $note=(! empty($line->note)?$line->note:''); |
| 50 | 50 | |
| 51 | - if ($issupplierline) $prodser = new ProductFournisseur($db); |
|
| 52 | - else $prodser = new Product($db); |
|
| 51 | + if ($issupplierline) { |
|
| 52 | + $prodser = new ProductFournisseur($db); |
|
| 53 | + } else { |
|
| 54 | + $prodser = new Product($db); |
|
| 55 | + } |
|
| 53 | 56 | |
| 54 | 57 | if ($idprod) |
| 55 | 58 | { |
@@ -57,9 +60,15 @@ discard block |
||
| 57 | 60 | // If a predefined product and multilang and on other lang, we renamed label with label translated |
| 58 | 61 | if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) |
| 59 | 62 | { |
| 60 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 61 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 62 | - if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 63 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) { |
|
| 64 | + $label=$prodser->multilangs[$outputlangs->defaultlang]["label"]; |
|
| 65 | + } |
|
| 66 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) { |
|
| 67 | + $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"]; |
|
| 68 | + } |
|
| 69 | + if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) { |
|
| 70 | + $note=$prodser->multilangs[$outputlangs->defaultlang]["note"]; |
|
| 71 | + } |
|
| 63 | 72 | } |
| 64 | 73 | } |
| 65 | 74 | |
@@ -75,35 +84,34 @@ discard block |
||
| 75 | 84 | $discount->fetch($line->fk_remise_except); |
| 76 | 85 | $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
| 77 | 86 | $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref); |
| 78 | - } |
|
| 79 | - elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) |
|
| 87 | + } elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) |
|
| 80 | 88 | { |
| 81 | 89 | $discount=new DiscountAbsolute($db); |
| 82 | 90 | $discount->fetch($line->fk_remise_except); |
| 83 | 91 | $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source; |
| 84 | 92 | $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref); |
| 85 | 93 | // Add date of deposit |
| 86 | - if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; |
|
| 87 | - } |
|
| 88 | - elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) |
|
| 94 | + if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) { |
|
| 95 | + $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; |
|
| 96 | + } |
|
| 97 | + } elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) |
|
| 89 | 98 | { |
| 90 | 99 | $discount=new DiscountAbsolute($db); |
| 91 | 100 | $discount->fetch($line->fk_remise_except); |
| 92 | 101 | $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source); |
| 93 | - } |
|
| 94 | - elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) |
|
| 102 | + } elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) |
|
| 95 | 103 | { |
| 96 | 104 | $discount=new DiscountAbsolute($db); |
| 97 | 105 | $discount->fetch($line->fk_remise_except); |
| 98 | 106 | $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source); |
| 99 | - } |
|
| 100 | - else |
|
| 107 | + } else |
|
| 101 | 108 | { |
| 102 | 109 | if ($idprod) |
| 103 | 110 | { |
| 104 | - if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 105 | - } |
|
| 106 | - else |
|
| 111 | + if (empty($hidedesc)) { |
|
| 112 | + $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
|
| 113 | + } |
|
| 114 | + } else |
|
| 107 | 115 | { |
| 108 | 116 | $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); |
| 109 | 117 | } |
@@ -118,13 +126,14 @@ discard block |
||
| 118 | 126 | { |
| 119 | 127 | $prefix_prodserv = ""; |
| 120 | 128 | $ref_prodserv = ""; |
| 121 | - if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) // In standard mode, we do not show this |
|
| 129 | + if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) { |
|
| 130 | + // In standard mode, we do not show this |
|
| 122 | 131 | { |
| 123 | 132 | if ($prodser->isService()) |
| 124 | 133 | { |
| 125 | 134 | $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." "; |
| 126 | - } |
|
| 127 | - else |
|
| 135 | + } |
|
| 136 | + } else |
|
| 128 | 137 | { |
| 129 | 138 | $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." "; |
| 130 | 139 | } |
@@ -132,8 +141,14 @@ discard block |
||
| 132 | 141 | |
| 133 | 142 | if (empty($hideref)) |
| 134 | 143 | { |
| 135 | - if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref |
|
| 136 | - else $ref_prodserv = $prodser->ref; // Show local ref only |
|
| 144 | + if ($issupplierline) { |
|
| 145 | + $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; |
|
| 146 | + } |
|
| 147 | + // Show local ref and supplier ref |
|
| 148 | + else { |
|
| 149 | + $ref_prodserv = $prodser->ref; |
|
| 150 | + } |
|
| 151 | + // Show local ref only |
|
| 137 | 152 | |
| 138 | 153 | $ref_prodserv .= " - "; |
| 139 | 154 | } |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | $h = 0; |
| 42 | 42 | $head = array(); |
| 43 | 43 | |
| 44 | - $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id; |
|
| 45 | - $head[$h][1] = $langs->trans('Card'); |
|
| 46 | - $head[$h][2] = 'card'; |
|
| 47 | - $h++; |
|
| 44 | + $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id; |
|
| 45 | + $head[$h][1] = $langs->trans('Card'); |
|
| 46 | + $head[$h][2] = 'card'; |
|
| 47 | + $h++; |
|
| 48 | 48 | |
| 49 | 49 | // Show more tabs from modules |
| 50 | 50 | // Entries must be declared in modules descriptor with line |
@@ -52,16 +52,16 @@ discard block |
||
| 52 | 52 | // $this->tabs = array('entity:-tabname); to remove a tab |
| 53 | 53 | complete_head_from_modules($conf,$langs,$object,$head,$h,'tax'); |
| 54 | 54 | |
| 55 | - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
|
| 55 | + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
|
| 56 | 56 | require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; |
| 57 | - $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 58 | - $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 57 | + $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 58 | + $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 59 | 59 | $nbLinks=Link::count($db, $object->element, $object->id); |
| 60 | - $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; |
|
| 61 | - $head[$h][1] = $langs->trans("Documents"); |
|
| 62 | - if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>'; |
|
| 63 | - $head[$h][2] = 'documents'; |
|
| 64 | - $h++; |
|
| 60 | + $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; |
|
| 61 | + $head[$h][1] = $langs->trans("Documents"); |
|
| 62 | + if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>'; |
|
| 63 | + $head[$h][2] = 'documents'; |
|
| 64 | + $h++; |
|
| 65 | 65 | |
| 66 | 66 | $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id; |
| 67 | 67 | $head[$h][1] = $langs->trans("Info"); |
@@ -95,39 +95,39 @@ discard block |
||
| 95 | 95 | // If we use date_start and date_end, we must not use $y, $m, $q |
| 96 | 96 | if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q))) |
| 97 | 97 | { |
| 98 | - dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
|
| 98 | + dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | $list=array(); |
| 102 | 102 | if ($direction == 'sell') |
| 103 | 103 | { |
| 104 | - $invoicetable='facture'; |
|
| 105 | - $invoicedettable='facturedet'; |
|
| 106 | - $fk_facture='fk_facture'; |
|
| 107 | - $fk_facture2='fk_facture'; |
|
| 108 | - $fk_payment='fk_paiement'; |
|
| 109 | - $total_tva='total_tva'; |
|
| 110 | - $paymenttable='paiement'; |
|
| 111 | - $paymentfacturetable='paiement_facture'; |
|
| 112 | - $invoicefieldref='ref'; |
|
| 104 | + $invoicetable='facture'; |
|
| 105 | + $invoicedettable='facturedet'; |
|
| 106 | + $fk_facture='fk_facture'; |
|
| 107 | + $fk_facture2='fk_facture'; |
|
| 108 | + $fk_payment='fk_paiement'; |
|
| 109 | + $total_tva='total_tva'; |
|
| 110 | + $paymenttable='paiement'; |
|
| 111 | + $paymentfacturetable='paiement_facture'; |
|
| 112 | + $invoicefieldref='ref'; |
|
| 113 | 113 | } |
| 114 | 114 | if ($direction == 'buy') |
| 115 | 115 | { |
| 116 | - $invoicetable='facture_fourn'; |
|
| 117 | - $invoicedettable='facture_fourn_det'; |
|
| 118 | - $fk_facture='fk_facture_fourn'; |
|
| 119 | - $fk_facture2='fk_facturefourn'; |
|
| 120 | - $fk_payment='fk_paiementfourn'; |
|
| 121 | - $total_tva='tva'; |
|
| 122 | - $paymenttable='paiementfourn'; |
|
| 123 | - $paymentfacturetable='paiementfourn_facturefourn'; |
|
| 124 | - $invoicefieldref='ref'; |
|
| 116 | + $invoicetable='facture_fourn'; |
|
| 117 | + $invoicedettable='facture_fourn_det'; |
|
| 118 | + $fk_facture='fk_facture_fourn'; |
|
| 119 | + $fk_facture2='fk_facturefourn'; |
|
| 120 | + $fk_payment='fk_paiementfourn'; |
|
| 121 | + $total_tva='tva'; |
|
| 122 | + $paymenttable='paiementfourn'; |
|
| 123 | + $paymentfacturetable='paiementfourn_facturefourn'; |
|
| 124 | + $invoicefieldref='ref'; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | if ( strpos( $type, 'localtax' ) === 0 ) { |
| 128 | - $f_rate = $type . '_tx'; |
|
| 128 | + $f_rate = $type . '_tx'; |
|
| 129 | 129 | } else { |
| 130 | - $f_rate = 'tva_tx'; |
|
| 130 | + $f_rate = 'tva_tx'; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | $total_localtax1='total_localtax1'; |
@@ -139,146 +139,146 @@ discard block |
||
| 139 | 139 | // Define sql request |
| 140 | 140 | $sql=''; |
| 141 | 141 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') |
| 142 | - || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
|
| 142 | + || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
|
| 143 | 143 | { |
| 144 | - // Count on delivery date (use invoice date as delivery is unknown) |
|
| 145 | - $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 146 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 147 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 148 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 149 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 150 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 151 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 152 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 153 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 154 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 155 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 156 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 157 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 158 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 159 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 160 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 161 | - if ($y && $m) |
|
| 162 | - { |
|
| 163 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 164 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 165 | - } |
|
| 166 | - else if ($y) |
|
| 167 | - { |
|
| 168 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 169 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 170 | - } |
|
| 171 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 172 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 173 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 174 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 175 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 176 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 144 | + // Count on delivery date (use invoice date as delivery is unknown) |
|
| 145 | + $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 146 | + $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 147 | + $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 148 | + $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 149 | + $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 150 | + $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 151 | + $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 152 | + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 153 | + $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 154 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 155 | + $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 156 | + $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 157 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 158 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 159 | + $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 160 | + $sql.= " AND s.rowid = f.fk_soc"; |
|
| 161 | + if ($y && $m) |
|
| 162 | + { |
|
| 163 | + $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 164 | + $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 165 | + } |
|
| 166 | + else if ($y) |
|
| 167 | + { |
|
| 168 | + $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 169 | + $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 170 | + } |
|
| 171 | + if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 172 | + if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 173 | + $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 174 | + $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 175 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 176 | + $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 177 | 177 | } |
| 178 | 178 | else |
| 179 | 179 | { |
| 180 | - // Count on payments date |
|
| 181 | - $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 182 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 183 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 184 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 185 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 186 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 187 | - $sql.= " pa.datep as datep"; |
|
| 188 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 189 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 190 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 191 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 192 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 193 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 194 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 195 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 196 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 197 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 198 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 199 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 200 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 201 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 202 | - if ($y && $m) |
|
| 203 | - { |
|
| 204 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 205 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 206 | - } |
|
| 207 | - else if ($y) |
|
| 208 | - { |
|
| 209 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 210 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 211 | - } |
|
| 212 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 213 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 214 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 215 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 216 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 217 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 180 | + // Count on payments date |
|
| 181 | + $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 182 | + $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 183 | + $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 184 | + $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 185 | + $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 186 | + $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 187 | + $sql.= " pa.datep as datep"; |
|
| 188 | + $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 189 | + $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 190 | + $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 191 | + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 192 | + $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 193 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 194 | + $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 195 | + $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 196 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 197 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 198 | + $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 199 | + $sql.= " AND s.rowid = f.fk_soc"; |
|
| 200 | + $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 201 | + $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 202 | + if ($y && $m) |
|
| 203 | + { |
|
| 204 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 205 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 206 | + } |
|
| 207 | + else if ($y) |
|
| 208 | + { |
|
| 209 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 210 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 211 | + } |
|
| 212 | + if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 213 | + if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 214 | + $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 215 | + $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 216 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 217 | + $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | if (! $sql) return -1; |
| 221 | 221 | if ($sql == 'TODO') return -2; |
| 222 | 222 | if ($sql != 'TODO') |
| 223 | 223 | { |
| 224 | - dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG); |
|
| 225 | - |
|
| 226 | - $resql = $db->query($sql); |
|
| 227 | - if ($resql) |
|
| 228 | - { |
|
| 229 | - $company_id = -1; |
|
| 230 | - $oldrowid=''; |
|
| 231 | - while($assoc = $db->fetch_array($resql)) |
|
| 232 | - { |
|
| 233 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 234 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 235 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 236 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 237 | - |
|
| 238 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 239 | - { |
|
| 240 | - $oldrowid=$assoc['rowid']; |
|
| 241 | - $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 242 | - $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 243 | - $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 244 | - $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 245 | - } |
|
| 246 | - $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 247 | - $list[$assoc['company_id']]['dtype'][] = $assoc['dtype']; |
|
| 248 | - $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']); |
|
| 249 | - $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']); |
|
| 250 | - $list[$assoc['company_id']]['company_name'][] = $assoc['company_name']; |
|
| 251 | - $list[$assoc['company_id']]['company_id'][] = $assoc['company_id']; |
|
| 252 | - $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 253 | - $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 254 | - $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 255 | - |
|
| 256 | - $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 257 | - $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 258 | - $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 259 | - $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 260 | - $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 261 | - |
|
| 262 | - $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 263 | - $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 264 | - $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 265 | - $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 266 | - |
|
| 267 | - $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 268 | - $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 269 | - $list[$assoc['company_id']]['ptype'][] = $assoc['ptype']; |
|
| 270 | - |
|
| 271 | - $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 272 | - $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 273 | - |
|
| 274 | - $company_id = $assoc['company_id']; |
|
| 275 | - } |
|
| 276 | - } |
|
| 277 | - else |
|
| 278 | - { |
|
| 279 | - dol_print_error($db); |
|
| 280 | - return -3; |
|
| 281 | - } |
|
| 224 | + dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG); |
|
| 225 | + |
|
| 226 | + $resql = $db->query($sql); |
|
| 227 | + if ($resql) |
|
| 228 | + { |
|
| 229 | + $company_id = -1; |
|
| 230 | + $oldrowid=''; |
|
| 231 | + while($assoc = $db->fetch_array($resql)) |
|
| 232 | + { |
|
| 233 | + if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 234 | + if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 235 | + if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 236 | + if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 237 | + |
|
| 238 | + if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 239 | + { |
|
| 240 | + $oldrowid=$assoc['rowid']; |
|
| 241 | + $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 242 | + $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 243 | + $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 244 | + $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 245 | + } |
|
| 246 | + $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 247 | + $list[$assoc['company_id']]['dtype'][] = $assoc['dtype']; |
|
| 248 | + $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']); |
|
| 249 | + $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']); |
|
| 250 | + $list[$assoc['company_id']]['company_name'][] = $assoc['company_name']; |
|
| 251 | + $list[$assoc['company_id']]['company_id'][] = $assoc['company_id']; |
|
| 252 | + $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 253 | + $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 254 | + $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 255 | + |
|
| 256 | + $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 257 | + $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 258 | + $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 259 | + $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 260 | + $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 261 | + |
|
| 262 | + $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 263 | + $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 264 | + $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 265 | + $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 266 | + |
|
| 267 | + $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 268 | + $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 269 | + $list[$assoc['company_id']]['ptype'][] = $assoc['ptype']; |
|
| 270 | + |
|
| 271 | + $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 272 | + $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 273 | + |
|
| 274 | + $company_id = $assoc['company_id']; |
|
| 275 | + } |
|
| 276 | + } |
|
| 277 | + else |
|
| 278 | + { |
|
| 279 | + dol_print_error($db); |
|
| 280 | + return -3; |
|
| 281 | + } |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | |
@@ -287,149 +287,149 @@ discard block |
||
| 287 | 287 | // Define sql request |
| 288 | 288 | $sql=''; |
| 289 | 289 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice') |
| 290 | - || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
|
| 290 | + || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
|
| 291 | 291 | { |
| 292 | - // Count on invoice date |
|
| 293 | - $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 294 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 295 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 296 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 297 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 298 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 299 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 300 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 301 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 302 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 303 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 304 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 305 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 306 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 307 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 308 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 309 | - if ($y && $m) |
|
| 310 | - { |
|
| 311 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 312 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 313 | - } |
|
| 314 | - else if ($y) |
|
| 315 | - { |
|
| 316 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 317 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 318 | - } |
|
| 319 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 320 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 321 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 322 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 323 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 324 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 292 | + // Count on invoice date |
|
| 293 | + $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 294 | + $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 295 | + $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 296 | + $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 297 | + $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 298 | + $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 299 | + $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 300 | + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 301 | + $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 302 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 303 | + $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 304 | + $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 305 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 306 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 307 | + $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 308 | + $sql.= " AND s.rowid = f.fk_soc"; |
|
| 309 | + if ($y && $m) |
|
| 310 | + { |
|
| 311 | + $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 312 | + $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 313 | + } |
|
| 314 | + else if ($y) |
|
| 315 | + { |
|
| 316 | + $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 317 | + $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 318 | + } |
|
| 319 | + if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 320 | + if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 321 | + $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 322 | + $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 323 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 324 | + $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 325 | 325 | } |
| 326 | 326 | else |
| 327 | 327 | { |
| 328 | - // Count on payments date |
|
| 329 | - $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 330 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 331 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 332 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 333 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 334 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 335 | - $sql.= " pa.datep as datep"; |
|
| 336 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 337 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 338 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 339 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 340 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 341 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 342 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 343 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 344 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 345 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 346 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 347 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 348 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 349 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 350 | - if ($y && $m) |
|
| 351 | - { |
|
| 352 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 353 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 354 | - } |
|
| 355 | - else if ($y) |
|
| 356 | - { |
|
| 357 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 358 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 359 | - } |
|
| 360 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 361 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 362 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 363 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 364 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 365 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 328 | + // Count on payments date |
|
| 329 | + $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 330 | + $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 331 | + $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 332 | + $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 333 | + $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 334 | + $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 335 | + $sql.= " pa.datep as datep"; |
|
| 336 | + $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 337 | + $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 338 | + $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 339 | + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 340 | + $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 341 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 342 | + $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 343 | + $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 344 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 345 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 346 | + $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 347 | + $sql.= " AND s.rowid = f.fk_soc"; |
|
| 348 | + $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 349 | + $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 350 | + if ($y && $m) |
|
| 351 | + { |
|
| 352 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 353 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 354 | + } |
|
| 355 | + else if ($y) |
|
| 356 | + { |
|
| 357 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 358 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 359 | + } |
|
| 360 | + if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 361 | + if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 362 | + $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 363 | + $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 364 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 365 | + $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | if (! $sql) |
| 369 | 369 | { |
| 370 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 371 | - return -1; // -1 = Not accountancy module enabled |
|
| 370 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 371 | + return -1; // -1 = Not accountancy module enabled |
|
| 372 | 372 | } |
| 373 | 373 | if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
| 374 | 374 | if ($sql != 'TODO') |
| 375 | 375 | { |
| 376 | - dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 377 | - $resql = $db->query($sql); |
|
| 378 | - if ($resql) |
|
| 379 | - { |
|
| 380 | - $company_id = -1; |
|
| 381 | - $oldrowid=''; |
|
| 382 | - while($assoc = $db->fetch_array($resql)) |
|
| 383 | - { |
|
| 384 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 385 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 386 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 387 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 388 | - |
|
| 389 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 390 | - { |
|
| 391 | - $oldrowid=$assoc['rowid']; |
|
| 392 | - $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 393 | - $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 394 | - $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 395 | - $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 396 | - } |
|
| 397 | - $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 398 | - $list[$assoc['company_id']]['dtype'][] = $assoc['dtype']; |
|
| 399 | - $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']); |
|
| 400 | - $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']); |
|
| 401 | - $list[$assoc['company_id']]['company_name'][] = $assoc['company_name']; |
|
| 402 | - $list[$assoc['company_id']]['company_id'][] = $assoc['company_id']; |
|
| 403 | - $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 404 | - $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 405 | - $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 406 | - |
|
| 407 | - $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 408 | - $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 409 | - $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 410 | - $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 411 | - $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 412 | - |
|
| 413 | - $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 414 | - $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 415 | - $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 416 | - $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 417 | - |
|
| 418 | - $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 419 | - $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 420 | - $list[$assoc['company_id']]['ptype'][] = $assoc['ptype']; |
|
| 421 | - |
|
| 422 | - $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 423 | - $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 424 | - |
|
| 425 | - $company_id = $assoc['company_id']; |
|
| 426 | - } |
|
| 427 | - } |
|
| 428 | - else |
|
| 429 | - { |
|
| 430 | - dol_print_error($db); |
|
| 431 | - return -3; |
|
| 432 | - } |
|
| 376 | + dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 377 | + $resql = $db->query($sql); |
|
| 378 | + if ($resql) |
|
| 379 | + { |
|
| 380 | + $company_id = -1; |
|
| 381 | + $oldrowid=''; |
|
| 382 | + while($assoc = $db->fetch_array($resql)) |
|
| 383 | + { |
|
| 384 | + if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 385 | + if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 386 | + if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 387 | + if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 388 | + |
|
| 389 | + if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 390 | + { |
|
| 391 | + $oldrowid=$assoc['rowid']; |
|
| 392 | + $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 393 | + $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 394 | + $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 395 | + $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 396 | + } |
|
| 397 | + $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 398 | + $list[$assoc['company_id']]['dtype'][] = $assoc['dtype']; |
|
| 399 | + $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']); |
|
| 400 | + $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']); |
|
| 401 | + $list[$assoc['company_id']]['company_name'][] = $assoc['company_name']; |
|
| 402 | + $list[$assoc['company_id']]['company_id'][] = $assoc['company_id']; |
|
| 403 | + $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 404 | + $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 405 | + $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 406 | + |
|
| 407 | + $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 408 | + $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 409 | + $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 410 | + $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 411 | + $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 412 | + |
|
| 413 | + $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 414 | + $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 415 | + $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 416 | + $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 417 | + |
|
| 418 | + $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 419 | + $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 420 | + $list[$assoc['company_id']]['ptype'][] = $assoc['ptype']; |
|
| 421 | + |
|
| 422 | + $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 423 | + $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 424 | + |
|
| 425 | + $company_id = $assoc['company_id']; |
|
| 426 | + } |
|
| 427 | + } |
|
| 428 | + else |
|
| 429 | + { |
|
| 430 | + dol_print_error($db); |
|
| 431 | + return -3; |
|
| 432 | + } |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | |
@@ -437,104 +437,104 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | if ($direction == 'buy') // buy only for expense reports |
| 439 | 439 | { |
| 440 | - // Define sql request |
|
| 441 | - $sql=''; |
|
| 442 | - |
|
| 443 | - // Count on payments date |
|
| 444 | - $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
|
| 445 | - $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 446 | - $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 447 | - $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 448 | - $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 449 | - $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e"; |
|
| 450 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 451 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 452 | - $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 453 | - $sql.= " AND e.fk_statut in (6)"; |
|
| 454 | - if ($y && $m) |
|
| 455 | - { |
|
| 456 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 457 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 458 | - } |
|
| 459 | - else if ($y) |
|
| 460 | - { |
|
| 461 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 462 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 463 | - } |
|
| 464 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 465 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 466 | - $sql.= " AND (d.product_type = -1"; |
|
| 467 | - $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 468 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 469 | - $sql.= " ORDER BY e.rowid"; |
|
| 470 | - |
|
| 471 | - if (! $sql) |
|
| 472 | - { |
|
| 473 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 474 | - return -1; // -1 = Not accountancy module enabled |
|
| 475 | - } |
|
| 476 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 477 | - if ($sql != 'TODO') |
|
| 478 | - { |
|
| 479 | - dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 480 | - $resql = $db->query($sql); |
|
| 481 | - if ($resql) |
|
| 482 | - { |
|
| 483 | - $company_id = -1; |
|
| 484 | - $oldrowid=''; |
|
| 485 | - while($assoc = $db->fetch_array($resql)) |
|
| 486 | - { |
|
| 487 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 488 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 489 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 490 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 491 | - |
|
| 492 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 493 | - { |
|
| 494 | - $oldrowid=$assoc['rowid']; |
|
| 495 | - $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 496 | - $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 497 | - $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 498 | - $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 499 | - } |
|
| 500 | - |
|
| 501 | - $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 502 | - $list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment'; |
|
| 503 | - $list[$assoc['company_id']]['datef'][] = $assoc['datef']; |
|
| 504 | - $list[$assoc['company_id']]['company_name'][] = ''; |
|
| 505 | - $list[$assoc['company_id']]['company_id'][] = ''; |
|
| 506 | - $list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author']; |
|
| 507 | - $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 508 | - $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 509 | - $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 510 | - |
|
| 511 | - $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 512 | - $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 513 | - $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 514 | - $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 515 | - $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 516 | - |
|
| 517 | - $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 518 | - $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 519 | - $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 520 | - $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 521 | - |
|
| 522 | - $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 523 | - $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 524 | - $list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment'; |
|
| 525 | - |
|
| 526 | - $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 527 | - $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 528 | - |
|
| 529 | - $company_id = $assoc['company_id']; |
|
| 530 | - } |
|
| 531 | - } |
|
| 532 | - else |
|
| 533 | - { |
|
| 534 | - dol_print_error($db); |
|
| 535 | - return -3; |
|
| 536 | - } |
|
| 537 | - } |
|
| 440 | + // Define sql request |
|
| 441 | + $sql=''; |
|
| 442 | + |
|
| 443 | + // Count on payments date |
|
| 444 | + $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
|
| 445 | + $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 446 | + $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 447 | + $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 448 | + $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 449 | + $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e"; |
|
| 450 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 451 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 452 | + $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 453 | + $sql.= " AND e.fk_statut in (6)"; |
|
| 454 | + if ($y && $m) |
|
| 455 | + { |
|
| 456 | + $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 457 | + $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 458 | + } |
|
| 459 | + else if ($y) |
|
| 460 | + { |
|
| 461 | + $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 462 | + $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 463 | + } |
|
| 464 | + if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 465 | + if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 466 | + $sql.= " AND (d.product_type = -1"; |
|
| 467 | + $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 468 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 469 | + $sql.= " ORDER BY e.rowid"; |
|
| 470 | + |
|
| 471 | + if (! $sql) |
|
| 472 | + { |
|
| 473 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 474 | + return -1; // -1 = Not accountancy module enabled |
|
| 475 | + } |
|
| 476 | + if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 477 | + if ($sql != 'TODO') |
|
| 478 | + { |
|
| 479 | + dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 480 | + $resql = $db->query($sql); |
|
| 481 | + if ($resql) |
|
| 482 | + { |
|
| 483 | + $company_id = -1; |
|
| 484 | + $oldrowid=''; |
|
| 485 | + while($assoc = $db->fetch_array($resql)) |
|
| 486 | + { |
|
| 487 | + if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 488 | + if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 489 | + if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 490 | + if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 491 | + |
|
| 492 | + if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 493 | + { |
|
| 494 | + $oldrowid=$assoc['rowid']; |
|
| 495 | + $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 496 | + $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
|
| 497 | + $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
|
| 498 | + $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
|
| 499 | + } |
|
| 500 | + |
|
| 501 | + $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 502 | + $list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment'; |
|
| 503 | + $list[$assoc['company_id']]['datef'][] = $assoc['datef']; |
|
| 504 | + $list[$assoc['company_id']]['company_name'][] = ''; |
|
| 505 | + $list[$assoc['company_id']]['company_id'][] = ''; |
|
| 506 | + $list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author']; |
|
| 507 | + $list[$assoc['company_id']]['drate'][] = $assoc['rate']; |
|
| 508 | + $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 509 | + $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 510 | + |
|
| 511 | + $list[$assoc['company_id']]['facid'][] = $assoc['facid']; |
|
| 512 | + $list[$assoc['company_id']]['facnum'][] = $assoc['facnum']; |
|
| 513 | + $list[$assoc['company_id']]['type'][] = $assoc['type']; |
|
| 514 | + $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 515 | + $list[$assoc['company_id']]['descr'][] = $assoc['descr']; |
|
| 516 | + |
|
| 517 | + $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
|
| 518 | + $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
|
| 519 | + $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 520 | + $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 521 | + |
|
| 522 | + $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
|
| 523 | + $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
|
| 524 | + $list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment'; |
|
| 525 | + |
|
| 526 | + $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id']; |
|
| 527 | + $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 528 | + |
|
| 529 | + $company_id = $assoc['company_id']; |
|
| 530 | + } |
|
| 531 | + } |
|
| 532 | + else |
|
| 533 | + { |
|
| 534 | + dol_print_error($db); |
|
| 535 | + return -3; |
|
| 536 | + } |
|
| 537 | + } |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | return $list; |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | // If we use date_start and date_end, we must not use $y, $m, $q |
| 564 | 564 | if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q))) |
| 565 | 565 | { |
| 566 | - dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
|
| 566 | + dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
|
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | $list=array(); |
@@ -593,14 +593,14 @@ discard block |
||
| 593 | 593 | $invoicefieldref='ref'; |
| 594 | 594 | } |
| 595 | 595 | |
| 596 | - if ( strpos( $type, 'localtax' ) === 0 ) { |
|
| 597 | - $f_rate = $type . '_tx'; |
|
| 598 | - } else { |
|
| 599 | - $f_rate = 'tva_tx'; |
|
| 600 | - } |
|
| 596 | + if ( strpos( $type, 'localtax' ) === 0 ) { |
|
| 597 | + $f_rate = $type . '_tx'; |
|
| 598 | + } else { |
|
| 599 | + $f_rate = 'tva_tx'; |
|
| 600 | + } |
|
| 601 | 601 | |
| 602 | - $total_localtax1='total_localtax1'; |
|
| 603 | - $total_localtax2='total_localtax2'; |
|
| 602 | + $total_localtax1='total_localtax1'; |
|
| 603 | + $total_localtax2='total_localtax2'; |
|
| 604 | 604 | |
| 605 | 605 | |
| 606 | 606 | // CAS DES BIENS/PRODUITS |
@@ -608,7 +608,7 @@ discard block |
||
| 608 | 608 | // Define sql request |
| 609 | 609 | $sql=''; |
| 610 | 610 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') |
| 611 | - || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
|
| 611 | + || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
|
| 612 | 612 | { |
| 613 | 613 | // Count on delivery date (use invoice date as delivery is unknown) |
| 614 | 614 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -646,44 +646,44 @@ discard block |
||
| 646 | 646 | } |
| 647 | 647 | else |
| 648 | 648 | { |
| 649 | - // Count on payments date |
|
| 650 | - $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 651 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 652 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 653 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 654 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 655 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 656 | - $sql.= " pa.datep as datep"; |
|
| 657 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 658 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 659 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 660 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 661 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 662 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 663 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 664 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 665 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 666 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 667 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 668 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 669 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 670 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 671 | - if ($y && $m) |
|
| 672 | - { |
|
| 673 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 674 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 675 | - } |
|
| 676 | - else if ($y) |
|
| 677 | - { |
|
| 678 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 679 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 680 | - } |
|
| 681 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 682 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 683 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 684 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 685 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 686 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 649 | + // Count on payments date |
|
| 650 | + $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
|
| 651 | + $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 652 | + $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 653 | + $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 654 | + $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 655 | + $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 656 | + $sql.= " pa.datep as datep"; |
|
| 657 | + $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 658 | + $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 659 | + $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 660 | + $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 661 | + $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 662 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 663 | + $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 664 | + $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 665 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 666 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 667 | + $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 668 | + $sql.= " AND s.rowid = f.fk_soc"; |
|
| 669 | + $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 670 | + $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 671 | + if ($y && $m) |
|
| 672 | + { |
|
| 673 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 674 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 675 | + } |
|
| 676 | + else if ($y) |
|
| 677 | + { |
|
| 678 | + $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 679 | + $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 680 | + } |
|
| 681 | + if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 682 | + if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 683 | + $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 684 | + $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 685 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 686 | + $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | if (! $sql) return -1; |
@@ -699,8 +699,8 @@ discard block |
||
| 699 | 699 | $oldrowid=''; |
| 700 | 700 | while($assoc = $db->fetch_array($resql)) |
| 701 | 701 | { |
| 702 | - // Code to avoid warnings when array entry not defined |
|
| 703 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 702 | + // Code to avoid warnings when array entry not defined |
|
| 703 | + if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 704 | 704 | if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
| 705 | 705 | if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
| 706 | 706 | if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | // Define sql request |
| 757 | 757 | $sql=''; |
| 758 | 758 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice') |
| 759 | - || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
|
| 759 | + || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
|
| 760 | 760 | { |
| 761 | 761 | // Count on invoice date |
| 762 | 762 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 773 | 773 | $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
| 774 | 774 | if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
| 775 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 775 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 776 | 776 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 777 | 777 | $sql.= " AND s.rowid = f.fk_soc"; |
| 778 | 778 | if ($y && $m) |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 812 | 812 | $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
| 813 | 813 | if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
| 814 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 814 | + else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 815 | 815 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 816 | 816 | $sql.= " AND s.rowid = f.fk_soc"; |
| 817 | 817 | $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
@@ -850,10 +850,10 @@ discard block |
||
| 850 | 850 | $oldrowid=''; |
| 851 | 851 | while($assoc = $db->fetch_array($resql)) |
| 852 | 852 | { |
| 853 | - // Code to avoid warnings when array entry not defined |
|
| 854 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 853 | + // Code to avoid warnings when array entry not defined |
|
| 854 | + if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 855 | 855 | if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
| 856 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 856 | + if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 857 | 857 | if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
| 858 | 858 | |
| 859 | 859 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
@@ -904,108 +904,108 @@ discard block |
||
| 904 | 904 | |
| 905 | 905 | // CASE OF EXPENSE REPORT |
| 906 | 906 | |
| 907 | - if ($direction == 'buy') // buy only for expense reports |
|
| 908 | - { |
|
| 909 | - // Define sql request |
|
| 910 | - $sql=''; |
|
| 911 | - |
|
| 912 | - // Count on payments date |
|
| 913 | - $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
|
| 914 | - $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 915 | - $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 916 | - $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 917 | - $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 918 | - $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e "; |
|
| 919 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 920 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 921 | - $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 922 | - $sql.= " AND e.fk_statut in (6)"; |
|
| 923 | - if ($y && $m) |
|
| 924 | - { |
|
| 925 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 926 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 927 | - } |
|
| 928 | - else if ($y) |
|
| 929 | - { |
|
| 930 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 931 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 932 | - } |
|
| 933 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 934 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 935 | - $sql.= " AND (d.product_type = -1"; |
|
| 936 | - $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 937 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 938 | - $sql.= " ORDER BY e.rowid"; |
|
| 939 | - |
|
| 940 | - if (! $sql) |
|
| 941 | - { |
|
| 942 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 943 | - return -1; // -1 = Not accountancy module enabled |
|
| 944 | - } |
|
| 945 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 946 | - if ($sql != 'TODO') |
|
| 947 | - { |
|
| 948 | - dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 949 | - $resql = $db->query($sql); |
|
| 950 | - if ($resql) |
|
| 951 | - { |
|
| 952 | - $rate = -1; |
|
| 953 | - $oldrowid=''; |
|
| 954 | - while($assoc = $db->fetch_array($resql)) |
|
| 955 | - { |
|
| 956 | - // Code to avoid warnings when array entry not defined |
|
| 957 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 958 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 959 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 960 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 961 | - |
|
| 962 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 963 | - { |
|
| 964 | - $oldrowid=$assoc['rowid']; |
|
| 965 | - $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
|
| 907 | + if ($direction == 'buy') // buy only for expense reports |
|
| 908 | + { |
|
| 909 | + // Define sql request |
|
| 910 | + $sql=''; |
|
| 911 | + |
|
| 912 | + // Count on payments date |
|
| 913 | + $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
|
| 914 | + $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 915 | + $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 916 | + $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 917 | + $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 918 | + $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e "; |
|
| 919 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 920 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 921 | + $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 922 | + $sql.= " AND e.fk_statut in (6)"; |
|
| 923 | + if ($y && $m) |
|
| 924 | + { |
|
| 925 | + $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 926 | + $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 927 | + } |
|
| 928 | + else if ($y) |
|
| 929 | + { |
|
| 930 | + $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 931 | + $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 932 | + } |
|
| 933 | + if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 934 | + if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 935 | + $sql.= " AND (d.product_type = -1"; |
|
| 936 | + $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 937 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 938 | + $sql.= " ORDER BY e.rowid"; |
|
| 939 | + |
|
| 940 | + if (! $sql) |
|
| 941 | + { |
|
| 942 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 943 | + return -1; // -1 = Not accountancy module enabled |
|
| 944 | + } |
|
| 945 | + if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 946 | + if ($sql != 'TODO') |
|
| 947 | + { |
|
| 948 | + dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
|
| 949 | + $resql = $db->query($sql); |
|
| 950 | + if ($resql) |
|
| 951 | + { |
|
| 952 | + $rate = -1; |
|
| 953 | + $oldrowid=''; |
|
| 954 | + while($assoc = $db->fetch_array($resql)) |
|
| 955 | + { |
|
| 956 | + // Code to avoid warnings when array entry not defined |
|
| 957 | + if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 958 | + if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 959 | + if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 960 | + if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 961 | + |
|
| 962 | + if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 963 | + { |
|
| 964 | + $oldrowid=$assoc['rowid']; |
|
| 965 | + $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
|
| 966 | 966 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 967 | - $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
|
| 968 | - $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2']; |
|
| 969 | - } |
|
| 970 | - |
|
| 971 | - $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 972 | - $list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment'; |
|
| 973 | - $list[$assoc['rate']]['datef'][] = $assoc['datef']; |
|
| 974 | - $list[$assoc['rate']]['company_name'][] = ''; |
|
| 975 | - $list[$assoc['rate']]['company_id'][] = ''; |
|
| 976 | - $list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author']; |
|
| 977 | - $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 978 | - $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 979 | - |
|
| 980 | - $list[$assoc['rate']]['facid'][] = $assoc['facid']; |
|
| 981 | - $list[$assoc['rate']]['facnum'][] = $assoc['facnum']; |
|
| 982 | - $list[$assoc['rate']]['type'][] = $assoc['type']; |
|
| 983 | - $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 984 | - $list[$assoc['rate']]['descr'][] = $assoc['descr']; |
|
| 985 | - |
|
| 986 | - $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht']; |
|
| 987 | - $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat']; |
|
| 988 | - $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 989 | - $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 990 | - |
|
| 991 | - $list[$assoc['rate']]['pid'][] = $assoc['pid']; |
|
| 992 | - $list[$assoc['rate']]['pref'][] = $assoc['pref']; |
|
| 993 | - $list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment'; |
|
| 994 | - |
|
| 995 | - $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id']; |
|
| 996 | - $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 997 | - |
|
| 998 | - $rate = $assoc['rate']; |
|
| 999 | - } |
|
| 1000 | - } |
|
| 1001 | - else |
|
| 1002 | - { |
|
| 1003 | - dol_print_error($db); |
|
| 1004 | - return -3; |
|
| 1005 | - } |
|
| 1006 | - } |
|
| 1007 | - } |
|
| 1008 | - |
|
| 1009 | - return $list; |
|
| 967 | + $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
|
| 968 | + $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2']; |
|
| 969 | + } |
|
| 970 | + |
|
| 971 | + $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc']; |
|
| 972 | + $list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment'; |
|
| 973 | + $list[$assoc['rate']]['datef'][] = $assoc['datef']; |
|
| 974 | + $list[$assoc['rate']]['company_name'][] = ''; |
|
| 975 | + $list[$assoc['rate']]['company_id'][] = ''; |
|
| 976 | + $list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author']; |
|
| 977 | + $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']); |
|
| 978 | + $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']); |
|
| 979 | + |
|
| 980 | + $list[$assoc['rate']]['facid'][] = $assoc['facid']; |
|
| 981 | + $list[$assoc['rate']]['facnum'][] = $assoc['facnum']; |
|
| 982 | + $list[$assoc['rate']]['type'][] = $assoc['type']; |
|
| 983 | + $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc']; |
|
| 984 | + $list[$assoc['rate']]['descr'][] = $assoc['descr']; |
|
| 985 | + |
|
| 986 | + $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht']; |
|
| 987 | + $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat']; |
|
| 988 | + $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1']; |
|
| 989 | + $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 990 | + |
|
| 991 | + $list[$assoc['rate']]['pid'][] = $assoc['pid']; |
|
| 992 | + $list[$assoc['rate']]['pref'][] = $assoc['pref']; |
|
| 993 | + $list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment'; |
|
| 994 | + |
|
| 995 | + $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id']; |
|
| 996 | + $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount']; |
|
| 997 | + |
|
| 998 | + $rate = $assoc['rate']; |
|
| 999 | + } |
|
| 1000 | + } |
|
| 1001 | + else |
|
| 1002 | + { |
|
| 1003 | + dol_print_error($db); |
|
| 1004 | + return -3; |
|
| 1005 | + } |
|
| 1006 | + } |
|
| 1007 | + } |
|
| 1008 | + |
|
| 1009 | + return $list; |
|
| 1010 | 1010 | } |
| 1011 | 1011 | |
@@ -50,16 +50,16 @@ discard block |
||
| 50 | 50 | // Entries must be declared in modules descriptor with line |
| 51 | 51 | // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
| 52 | 52 | // $this->tabs = array('entity:-tabname); to remove a tab |
| 53 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'tax'); |
|
| 53 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax'); |
|
| 54 | 54 | |
| 55 | 55 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 56 | 56 | require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; |
| 57 | - $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 58 | - $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 59 | - $nbLinks=Link::count($db, $object->element, $object->id); |
|
| 57 | + $upload_dir = $conf->tax->dir_output."/".dol_sanitizeFileName($object->ref); |
|
| 58 | + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); |
|
| 59 | + $nbLinks = Link::count($db, $object->element, $object->id); |
|
| 60 | 60 | $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; |
| 61 | 61 | $head[$h][1] = $langs->trans("Documents"); |
| 62 | - if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>'; |
|
| 62 | + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>'; |
|
| 63 | 63 | $head[$h][2] = 'documents'; |
| 64 | 64 | $h++; |
| 65 | 65 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $head[$h][2] = 'info'; |
| 69 | 69 | $h++; |
| 70 | 70 | |
| 71 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'tax','remove'); |
|
| 71 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove'); |
|
| 72 | 72 | |
| 73 | 73 | return $head; |
| 74 | 74 | } |
@@ -88,136 +88,136 @@ discard block |
||
| 88 | 88 | * @param int $q Quarter |
| 89 | 89 | * @return array Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developped, -3 if error |
| 90 | 90 | */ |
| 91 | -function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m=0, $q=0) |
|
| 91 | +function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0) |
|
| 92 | 92 | { |
| 93 | 93 | global $conf; |
| 94 | 94 | |
| 95 | 95 | // If we use date_start and date_end, we must not use $y, $m, $q |
| 96 | - if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q))) |
|
| 96 | + if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) |
|
| 97 | 97 | { |
| 98 | 98 | dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - $list=array(); |
|
| 101 | + $list = array(); |
|
| 102 | 102 | if ($direction == 'sell') |
| 103 | 103 | { |
| 104 | - $invoicetable='facture'; |
|
| 105 | - $invoicedettable='facturedet'; |
|
| 106 | - $fk_facture='fk_facture'; |
|
| 107 | - $fk_facture2='fk_facture'; |
|
| 108 | - $fk_payment='fk_paiement'; |
|
| 109 | - $total_tva='total_tva'; |
|
| 110 | - $paymenttable='paiement'; |
|
| 111 | - $paymentfacturetable='paiement_facture'; |
|
| 112 | - $invoicefieldref='ref'; |
|
| 104 | + $invoicetable = 'facture'; |
|
| 105 | + $invoicedettable = 'facturedet'; |
|
| 106 | + $fk_facture = 'fk_facture'; |
|
| 107 | + $fk_facture2 = 'fk_facture'; |
|
| 108 | + $fk_payment = 'fk_paiement'; |
|
| 109 | + $total_tva = 'total_tva'; |
|
| 110 | + $paymenttable = 'paiement'; |
|
| 111 | + $paymentfacturetable = 'paiement_facture'; |
|
| 112 | + $invoicefieldref = 'ref'; |
|
| 113 | 113 | } |
| 114 | 114 | if ($direction == 'buy') |
| 115 | 115 | { |
| 116 | - $invoicetable='facture_fourn'; |
|
| 117 | - $invoicedettable='facture_fourn_det'; |
|
| 118 | - $fk_facture='fk_facture_fourn'; |
|
| 119 | - $fk_facture2='fk_facturefourn'; |
|
| 120 | - $fk_payment='fk_paiementfourn'; |
|
| 121 | - $total_tva='tva'; |
|
| 122 | - $paymenttable='paiementfourn'; |
|
| 123 | - $paymentfacturetable='paiementfourn_facturefourn'; |
|
| 124 | - $invoicefieldref='ref'; |
|
| 116 | + $invoicetable = 'facture_fourn'; |
|
| 117 | + $invoicedettable = 'facture_fourn_det'; |
|
| 118 | + $fk_facture = 'fk_facture_fourn'; |
|
| 119 | + $fk_facture2 = 'fk_facturefourn'; |
|
| 120 | + $fk_payment = 'fk_paiementfourn'; |
|
| 121 | + $total_tva = 'tva'; |
|
| 122 | + $paymenttable = 'paiementfourn'; |
|
| 123 | + $paymentfacturetable = 'paiementfourn_facturefourn'; |
|
| 124 | + $invoicefieldref = 'ref'; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - if ( strpos( $type, 'localtax' ) === 0 ) { |
|
| 128 | - $f_rate = $type . '_tx'; |
|
| 127 | + if (strpos($type, 'localtax') === 0) { |
|
| 128 | + $f_rate = $type.'_tx'; |
|
| 129 | 129 | } else { |
| 130 | 130 | $f_rate = 'tva_tx'; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - $total_localtax1='total_localtax1'; |
|
| 134 | - $total_localtax2='total_localtax2'; |
|
| 133 | + $total_localtax1 = 'total_localtax1'; |
|
| 134 | + $total_localtax2 = 'total_localtax2'; |
|
| 135 | 135 | |
| 136 | 136 | |
| 137 | 137 | // CAS DES BIENS/PRODUITS |
| 138 | 138 | |
| 139 | 139 | // Define sql request |
| 140 | - $sql=''; |
|
| 140 | + $sql = ''; |
|
| 141 | 141 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') |
| 142 | 142 | || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
| 143 | 143 | { |
| 144 | 144 | // Count on delivery date (use invoice date as delivery is unknown) |
| 145 | 145 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 146 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 147 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 148 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 149 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 150 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 151 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 152 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 153 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 154 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 155 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 156 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 157 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 158 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 159 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 160 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 146 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 147 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 148 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 149 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 150 | + $sql .= " 0 as payment_id, 0 as payment_amount"; |
|
| 151 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 152 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 153 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 154 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 155 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 156 | + $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 157 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 158 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 159 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 160 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 161 | 161 | if ($y && $m) |
| 162 | 162 | { |
| 163 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 164 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 163 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 164 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 165 | 165 | } |
| 166 | 166 | else if ($y) |
| 167 | 167 | { |
| 168 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 169 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 168 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 169 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 170 | 170 | } |
| 171 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 172 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 173 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 174 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 175 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 176 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 171 | + if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")"; |
|
| 172 | + if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 173 | + $sql .= " AND (d.product_type = 0"; // Limit to products |
|
| 174 | + $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 175 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 176 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 177 | 177 | } |
| 178 | 178 | else |
| 179 | 179 | { |
| 180 | 180 | // Count on payments date |
| 181 | 181 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 182 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 183 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 184 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 185 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 186 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 187 | - $sql.= " pa.datep as datep"; |
|
| 188 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 189 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 190 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 191 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 192 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 193 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 194 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 195 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 196 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 197 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 198 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 199 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 200 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 201 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 182 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 183 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 184 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 185 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 186 | + $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 187 | + $sql .= " pa.datep as datep"; |
|
| 188 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 189 | + $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 190 | + $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 191 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 192 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 193 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 194 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 195 | + $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 196 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 197 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 198 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 199 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 200 | + $sql .= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 201 | + $sql .= " AND pa.rowid = pf.".$fk_payment; |
|
| 202 | 202 | if ($y && $m) |
| 203 | 203 | { |
| 204 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 205 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 204 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 205 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 206 | 206 | } |
| 207 | 207 | else if ($y) |
| 208 | 208 | { |
| 209 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 210 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 209 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 210 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 211 | 211 | } |
| 212 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 213 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 214 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 215 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 216 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 217 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 212 | + if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")"; |
|
| 213 | + if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 214 | + $sql .= " AND (d.product_type = 0"; // Limit to products |
|
| 215 | + $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 216 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 217 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - if (! $sql) return -1; |
|
| 220 | + if (!$sql) return -1; |
|
| 221 | 221 | if ($sql == 'TODO') return -2; |
| 222 | 222 | if ($sql != 'TODO') |
| 223 | 223 | { |
@@ -227,17 +227,17 @@ discard block |
||
| 227 | 227 | if ($resql) |
| 228 | 228 | { |
| 229 | 229 | $company_id = -1; |
| 230 | - $oldrowid=''; |
|
| 231 | - while($assoc = $db->fetch_array($resql)) |
|
| 230 | + $oldrowid = ''; |
|
| 231 | + while ($assoc = $db->fetch_array($resql)) |
|
| 232 | 232 | { |
| 233 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 234 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 235 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 236 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 233 | + if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0; |
|
| 234 | + if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0; |
|
| 235 | + if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0; |
|
| 236 | + if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0; |
|
| 237 | 237 | |
| 238 | 238 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 239 | 239 | { |
| 240 | - $oldrowid=$assoc['rowid']; |
|
| 240 | + $oldrowid = $assoc['rowid']; |
|
| 241 | 241 | $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
| 242 | 242 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 243 | 243 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht']; |
| 263 | 263 | $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat']; |
| 264 | 264 | $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1']; |
| 265 | - $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 265 | + $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2']; |
|
| 266 | 266 | |
| 267 | 267 | $list[$assoc['company_id']]['pid'][] = $assoc['pid']; |
| 268 | 268 | $list[$assoc['company_id']]['pref'][] = $assoc['pref']; |
@@ -285,90 +285,90 @@ discard block |
||
| 285 | 285 | // CAS DES SERVICES |
| 286 | 286 | |
| 287 | 287 | // Define sql request |
| 288 | - $sql=''; |
|
| 288 | + $sql = ''; |
|
| 289 | 289 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice') |
| 290 | 290 | || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
| 291 | 291 | { |
| 292 | 292 | // Count on invoice date |
| 293 | 293 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 294 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 295 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 296 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 297 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 298 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 299 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 300 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 301 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 302 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 303 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 304 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 305 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 306 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 307 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 308 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 294 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 295 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 296 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 297 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 298 | + $sql .= " 0 as payment_id, 0 as payment_amount"; |
|
| 299 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 300 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 301 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 302 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 303 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 304 | + $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 305 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 306 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 307 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 308 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 309 | 309 | if ($y && $m) |
| 310 | 310 | { |
| 311 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 312 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 311 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 312 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 313 | 313 | } |
| 314 | 314 | else if ($y) |
| 315 | 315 | { |
| 316 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 317 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 316 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 317 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 318 | 318 | } |
| 319 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 320 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 321 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 322 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 323 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 324 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 319 | + if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")"; |
|
| 320 | + if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 321 | + $sql .= " AND (d.product_type = 1"; // Limit to services |
|
| 322 | + $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 323 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 324 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 325 | 325 | } |
| 326 | 326 | else |
| 327 | 327 | { |
| 328 | 328 | // Count on payments date |
| 329 | 329 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 330 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 331 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 332 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 333 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 334 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 335 | - $sql.= " pa.datep as datep"; |
|
| 336 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 337 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 338 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 339 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 340 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 341 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 342 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 343 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 344 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 345 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 346 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 347 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 348 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 349 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 330 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 331 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 332 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 333 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 334 | + $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 335 | + $sql .= " pa.datep as datep"; |
|
| 336 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 337 | + $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 338 | + $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 339 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 340 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 341 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 342 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 343 | + $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 344 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 345 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 346 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 347 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 348 | + $sql .= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 349 | + $sql .= " AND pa.rowid = pf.".$fk_payment; |
|
| 350 | 350 | if ($y && $m) |
| 351 | 351 | { |
| 352 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 353 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 352 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 353 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 354 | 354 | } |
| 355 | 355 | else if ($y) |
| 356 | 356 | { |
| 357 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 358 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 357 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 358 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 359 | 359 | } |
| 360 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 361 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 362 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 363 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 364 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 365 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 360 | + if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")"; |
|
| 361 | + if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 362 | + $sql .= " AND (d.product_type = 1"; // Limit to services |
|
| 363 | + $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 364 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 365 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - if (! $sql) |
|
| 368 | + if (!$sql) |
|
| 369 | 369 | { |
| 370 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 371 | - return -1; // -1 = Not accountancy module enabled |
|
| 370 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR); |
|
| 371 | + return -1; // -1 = Not accountancy module enabled |
|
| 372 | 372 | } |
| 373 | 373 | if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
| 374 | 374 | if ($sql != 'TODO') |
@@ -378,17 +378,17 @@ discard block |
||
| 378 | 378 | if ($resql) |
| 379 | 379 | { |
| 380 | 380 | $company_id = -1; |
| 381 | - $oldrowid=''; |
|
| 382 | - while($assoc = $db->fetch_array($resql)) |
|
| 381 | + $oldrowid = ''; |
|
| 382 | + while ($assoc = $db->fetch_array($resql)) |
|
| 383 | 383 | { |
| 384 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 385 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 386 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 387 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 384 | + if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0; |
|
| 385 | + if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0; |
|
| 386 | + if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0; |
|
| 387 | + if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0; |
|
| 388 | 388 | |
| 389 | 389 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 390 | 390 | { |
| 391 | - $oldrowid=$assoc['rowid']; |
|
| 391 | + $oldrowid = $assoc['rowid']; |
|
| 392 | 392 | $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
| 393 | 393 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 394 | 394 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
@@ -438,40 +438,40 @@ discard block |
||
| 438 | 438 | if ($direction == 'buy') // buy only for expense reports |
| 439 | 439 | { |
| 440 | 440 | // Define sql request |
| 441 | - $sql=''; |
|
| 441 | + $sql = ''; |
|
| 442 | 442 | |
| 443 | 443 | // Count on payments date |
| 444 | 444 | $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
| 445 | - $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 446 | - $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 447 | - $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 448 | - $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 449 | - $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e"; |
|
| 450 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 451 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 452 | - $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 453 | - $sql.= " AND e.fk_statut in (6)"; |
|
| 445 | + $sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 446 | + $sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 447 | + $sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 448 | + $sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 449 | + $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e"; |
|
| 450 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 451 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 452 | + $sql .= " WHERE e.entity = ".$conf->entity; |
|
| 453 | + $sql .= " AND e.fk_statut in (6)"; |
|
| 454 | 454 | if ($y && $m) |
| 455 | 455 | { |
| 456 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 457 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 456 | + $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 457 | + $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 458 | 458 | } |
| 459 | 459 | else if ($y) |
| 460 | 460 | { |
| 461 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 462 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 461 | + $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 462 | + $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 463 | 463 | } |
| 464 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 465 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 466 | - $sql.= " AND (d.product_type = -1"; |
|
| 467 | - $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 468 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 469 | - $sql.= " ORDER BY e.rowid"; |
|
| 470 | - |
|
| 471 | - if (! $sql) |
|
| 464 | + if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")"; |
|
| 465 | + if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 466 | + $sql .= " AND (d.product_type = -1"; |
|
| 467 | + $sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 468 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 469 | + $sql .= " ORDER BY e.rowid"; |
|
| 470 | + |
|
| 471 | + if (!$sql) |
|
| 472 | 472 | { |
| 473 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 474 | - return -1; // -1 = Not accountancy module enabled |
|
| 473 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR); |
|
| 474 | + return -1; // -1 = Not accountancy module enabled |
|
| 475 | 475 | } |
| 476 | 476 | if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
| 477 | 477 | if ($sql != 'TODO') |
@@ -481,18 +481,18 @@ discard block |
||
| 481 | 481 | if ($resql) |
| 482 | 482 | { |
| 483 | 483 | $company_id = -1; |
| 484 | - $oldrowid=''; |
|
| 485 | - while($assoc = $db->fetch_array($resql)) |
|
| 484 | + $oldrowid = ''; |
|
| 485 | + while ($assoc = $db->fetch_array($resql)) |
|
| 486 | 486 | { |
| 487 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 488 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 489 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 490 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 487 | + if (!isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht'] = 0; |
|
| 488 | + if (!isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat'] = 0; |
|
| 489 | + if (!isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1'] = 0; |
|
| 490 | + if (!isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2'] = 0; |
|
| 491 | 491 | |
| 492 | 492 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 493 | 493 | { |
| 494 | - $oldrowid=$assoc['rowid']; |
|
| 495 | - $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 494 | + $oldrowid = $assoc['rowid']; |
|
| 495 | + $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
|
| 496 | 496 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 497 | 497 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
| 498 | 498 | $list[$assoc['company_id']]['localtax2'] += $assoc['total_localtax2']; |
@@ -556,137 +556,137 @@ discard block |
||
| 556 | 556 | * @param int $m Month |
| 557 | 557 | * @return array Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developped, -3 if error |
| 558 | 558 | */ |
| 559 | -function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m=0) |
|
| 559 | +function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m = 0) |
|
| 560 | 560 | { |
| 561 | 561 | global $conf; |
| 562 | 562 | |
| 563 | 563 | // If we use date_start and date_end, we must not use $y, $m, $q |
| 564 | - if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q))) |
|
| 564 | + if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) |
|
| 565 | 565 | { |
| 566 | 566 | dol_print_error('', 'Bad value of input parameter for tax_by_rate'); |
| 567 | 567 | } |
| 568 | 568 | |
| 569 | - $list=array(); |
|
| 569 | + $list = array(); |
|
| 570 | 570 | |
| 571 | 571 | if ($direction == 'sell') |
| 572 | 572 | { |
| 573 | - $invoicetable='facture'; |
|
| 574 | - $invoicedettable='facturedet'; |
|
| 575 | - $fk_facture='fk_facture'; |
|
| 576 | - $fk_facture2='fk_facture'; |
|
| 577 | - $fk_payment='fk_paiement'; |
|
| 578 | - $total_tva='total_tva'; |
|
| 579 | - $paymenttable='paiement'; |
|
| 580 | - $paymentfacturetable='paiement_facture'; |
|
| 581 | - $invoicefieldref='ref'; |
|
| 573 | + $invoicetable = 'facture'; |
|
| 574 | + $invoicedettable = 'facturedet'; |
|
| 575 | + $fk_facture = 'fk_facture'; |
|
| 576 | + $fk_facture2 = 'fk_facture'; |
|
| 577 | + $fk_payment = 'fk_paiement'; |
|
| 578 | + $total_tva = 'total_tva'; |
|
| 579 | + $paymenttable = 'paiement'; |
|
| 580 | + $paymentfacturetable = 'paiement_facture'; |
|
| 581 | + $invoicefieldref = 'ref'; |
|
| 582 | 582 | } |
| 583 | 583 | else |
| 584 | 584 | { |
| 585 | - $invoicetable='facture_fourn'; |
|
| 586 | - $invoicedettable='facture_fourn_det'; |
|
| 587 | - $fk_facture='fk_facture_fourn'; |
|
| 588 | - $fk_facture2='fk_facturefourn'; |
|
| 589 | - $fk_payment='fk_paiementfourn'; |
|
| 590 | - $total_tva='tva'; |
|
| 591 | - $paymenttable='paiementfourn'; |
|
| 592 | - $paymentfacturetable='paiementfourn_facturefourn'; |
|
| 593 | - $invoicefieldref='ref'; |
|
| 585 | + $invoicetable = 'facture_fourn'; |
|
| 586 | + $invoicedettable = 'facture_fourn_det'; |
|
| 587 | + $fk_facture = 'fk_facture_fourn'; |
|
| 588 | + $fk_facture2 = 'fk_facturefourn'; |
|
| 589 | + $fk_payment = 'fk_paiementfourn'; |
|
| 590 | + $total_tva = 'tva'; |
|
| 591 | + $paymenttable = 'paiementfourn'; |
|
| 592 | + $paymentfacturetable = 'paiementfourn_facturefourn'; |
|
| 593 | + $invoicefieldref = 'ref'; |
|
| 594 | 594 | } |
| 595 | 595 | |
| 596 | - if ( strpos( $type, 'localtax' ) === 0 ) { |
|
| 597 | - $f_rate = $type . '_tx'; |
|
| 596 | + if (strpos($type, 'localtax') === 0) { |
|
| 597 | + $f_rate = $type.'_tx'; |
|
| 598 | 598 | } else { |
| 599 | 599 | $f_rate = 'tva_tx'; |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | - $total_localtax1='total_localtax1'; |
|
| 603 | - $total_localtax2='total_localtax2'; |
|
| 602 | + $total_localtax1 = 'total_localtax1'; |
|
| 603 | + $total_localtax2 = 'total_localtax2'; |
|
| 604 | 604 | |
| 605 | 605 | |
| 606 | 606 | // CAS DES BIENS/PRODUITS |
| 607 | 607 | |
| 608 | 608 | // Define sql request |
| 609 | - $sql=''; |
|
| 609 | + $sql = ''; |
|
| 610 | 610 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') |
| 611 | 611 | || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) |
| 612 | 612 | { |
| 613 | 613 | // Count on delivery date (use invoice date as delivery is unknown) |
| 614 | 614 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 615 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 616 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 617 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 618 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 619 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 620 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 621 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 622 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 623 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 624 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 625 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 626 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 627 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 628 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 629 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 615 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 616 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 617 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 618 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 619 | + $sql .= " 0 as payment_id, 0 as payment_amount"; |
|
| 620 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 621 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 622 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 623 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 624 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 625 | + $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 626 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 627 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 628 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 629 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 630 | 630 | if ($y && $m) |
| 631 | 631 | { |
| 632 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 633 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 632 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 633 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 634 | 634 | } |
| 635 | 635 | else if ($y) |
| 636 | 636 | { |
| 637 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 638 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 637 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 638 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 639 | 639 | } |
| 640 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 641 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 642 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 643 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 644 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 645 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 640 | + if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")"; |
|
| 641 | + if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 642 | + $sql .= " AND (d.product_type = 0"; // Limit to products |
|
| 643 | + $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 644 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 645 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 646 | 646 | } |
| 647 | 647 | else |
| 648 | 648 | { |
| 649 | 649 | // Count on payments date |
| 650 | 650 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 651 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 652 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 653 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 654 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 655 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 656 | - $sql.= " pa.datep as datep"; |
|
| 657 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 658 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 659 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 660 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 661 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 662 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 663 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 664 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 665 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 666 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 667 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 668 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 669 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 670 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 651 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 652 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 653 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 654 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 655 | + $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 656 | + $sql .= " pa.datep as datep"; |
|
| 657 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 658 | + $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 659 | + $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 660 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 661 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 662 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 663 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 664 | + $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 665 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 666 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 667 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 668 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 669 | + $sql .= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 670 | + $sql .= " AND pa.rowid = pf.".$fk_payment; |
|
| 671 | 671 | if ($y && $m) |
| 672 | 672 | { |
| 673 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 674 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 673 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 674 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 675 | 675 | } |
| 676 | 676 | else if ($y) |
| 677 | 677 | { |
| 678 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 679 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 678 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 679 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 680 | 680 | } |
| 681 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 682 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 683 | - $sql.= " AND (d.product_type = 0"; // Limit to products |
|
| 684 | - $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 685 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 686 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 681 | + if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")"; |
|
| 682 | + if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 683 | + $sql .= " AND (d.product_type = 0"; // Limit to products |
|
| 684 | + $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
|
| 685 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 686 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | - if (! $sql) return -1; |
|
| 689 | + if (!$sql) return -1; |
|
| 690 | 690 | if ($sql == 'TODO') return -2; |
| 691 | 691 | if ($sql != 'TODO') |
| 692 | 692 | { |
@@ -696,18 +696,18 @@ discard block |
||
| 696 | 696 | if ($resql) |
| 697 | 697 | { |
| 698 | 698 | $rate = -1; |
| 699 | - $oldrowid=''; |
|
| 700 | - while($assoc = $db->fetch_array($resql)) |
|
| 699 | + $oldrowid = ''; |
|
| 700 | + while ($assoc = $db->fetch_array($resql)) |
|
| 701 | 701 | { |
| 702 | 702 | // Code to avoid warnings when array entry not defined |
| 703 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 704 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 705 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 706 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 703 | + if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0; |
|
| 704 | + if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0; |
|
| 705 | + if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0; |
|
| 706 | + if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0; |
|
| 707 | 707 | |
| 708 | 708 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 709 | 709 | { |
| 710 | - $oldrowid=$assoc['rowid']; |
|
| 710 | + $oldrowid = $assoc['rowid']; |
|
| 711 | 711 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 712 | 712 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 713 | 713 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
@@ -754,90 +754,90 @@ discard block |
||
| 754 | 754 | // CAS DES SERVICES |
| 755 | 755 | |
| 756 | 756 | // Define sql request |
| 757 | - $sql=''; |
|
| 757 | + $sql = ''; |
|
| 758 | 758 | if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice') |
| 759 | 759 | || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) |
| 760 | 760 | { |
| 761 | 761 | // Count on invoice date |
| 762 | 762 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 763 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 764 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 765 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 766 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 767 | - $sql.= " 0 as payment_id, 0 as payment_amount"; |
|
| 768 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 769 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 770 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ; |
|
| 771 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 772 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 773 | - $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 774 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 775 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 776 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 777 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 763 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 764 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 765 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 766 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 767 | + $sql .= " 0 as payment_id, 0 as payment_amount"; |
|
| 768 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 769 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 770 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 771 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 772 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 773 | + $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
|
| 774 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 775 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 776 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 777 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 778 | 778 | if ($y && $m) |
| 779 | 779 | { |
| 780 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 781 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 780 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 781 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 782 | 782 | } |
| 783 | 783 | else if ($y) |
| 784 | 784 | { |
| 785 | - $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 786 | - $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 785 | + $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 786 | + $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 787 | 787 | } |
| 788 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 789 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 790 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 791 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 792 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 793 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 788 | + if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")"; |
|
| 789 | + if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 790 | + $sql .= " AND (d.product_type = 1"; // Limit to services |
|
| 791 | + $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 792 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 793 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture; |
|
| 794 | 794 | } |
| 795 | 795 | else |
| 796 | 796 | { |
| 797 | 797 | // Count on payments date |
| 798 | 798 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
| 799 | - $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 800 | - $sql.= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 801 | - $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 802 | - $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 803 | - $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 804 | - $sql.= " pa.datep as datep"; |
|
| 805 | - $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 806 | - $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 807 | - $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 808 | - $sql.= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 809 | - $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 810 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 811 | - $sql.= " WHERE f.entity = " . $conf->entity; |
|
| 812 | - $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 813 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 814 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 815 | - $sql.= " AND f.rowid = d.".$fk_facture; |
|
| 816 | - $sql.= " AND s.rowid = f.fk_soc"; |
|
| 817 | - $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 818 | - $sql.= " AND pa.rowid = pf.".$fk_payment; |
|
| 799 | + $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, "; |
|
| 800 | + $sql .= " d.date_start as date_start, d.date_end as date_end,"; |
|
| 801 | + $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,"; |
|
| 802 | + $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,"; |
|
| 803 | + $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,"; |
|
| 804 | + $sql .= " pa.datep as datep"; |
|
| 805 | + $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,"; |
|
| 806 | + $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,"; |
|
| 807 | + $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,"; |
|
| 808 | + $sql .= " ".MAIN_DB_PREFIX."societe as s,"; |
|
| 809 | + $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d"; |
|
| 810 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
|
| 811 | + $sql .= " WHERE f.entity = ".$conf->entity; |
|
| 812 | + $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
|
| 813 | + if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)"; |
|
| 814 | + else $sql .= " AND f.type IN (0,1,2,3,5)"; |
|
| 815 | + $sql .= " AND f.rowid = d.".$fk_facture; |
|
| 816 | + $sql .= " AND s.rowid = f.fk_soc"; |
|
| 817 | + $sql .= " AND pf.".$fk_facture2." = f.rowid"; |
|
| 818 | + $sql .= " AND pa.rowid = pf.".$fk_payment; |
|
| 819 | 819 | if ($y && $m) |
| 820 | 820 | { |
| 821 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 822 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 821 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 822 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 823 | 823 | } |
| 824 | 824 | else if ($y) |
| 825 | 825 | { |
| 826 | - $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 827 | - $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 826 | + $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 827 | + $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 828 | 828 | } |
| 829 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 830 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 831 | - $sql.= " AND (d.product_type = 1"; // Limit to services |
|
| 832 | - $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 833 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 834 | - $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 829 | + if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")"; |
|
| 830 | + if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 831 | + $sql .= " AND (d.product_type = 1"; // Limit to services |
|
| 832 | + $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
|
| 833 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 834 | + $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
|
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - if (! $sql) |
|
| 837 | + if (!$sql) |
|
| 838 | 838 | { |
| 839 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 840 | - return -1; // -1 = Not accountancy module enabled |
|
| 839 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR); |
|
| 840 | + return -1; // -1 = Not accountancy module enabled |
|
| 841 | 841 | } |
| 842 | 842 | if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
| 843 | 843 | if ($sql != 'TODO') |
@@ -847,18 +847,18 @@ discard block |
||
| 847 | 847 | if ($resql) |
| 848 | 848 | { |
| 849 | 849 | $rate = -1; |
| 850 | - $oldrowid=''; |
|
| 851 | - while($assoc = $db->fetch_array($resql)) |
|
| 850 | + $oldrowid = ''; |
|
| 851 | + while ($assoc = $db->fetch_array($resql)) |
|
| 852 | 852 | { |
| 853 | 853 | // Code to avoid warnings when array entry not defined |
| 854 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 855 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 856 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 857 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 854 | + if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0; |
|
| 855 | + if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0; |
|
| 856 | + if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0; |
|
| 857 | + if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0; |
|
| 858 | 858 | |
| 859 | 859 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 860 | 860 | { |
| 861 | - $oldrowid=$assoc['rowid']; |
|
| 861 | + $oldrowid = $assoc['rowid']; |
|
| 862 | 862 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 863 | 863 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 864 | 864 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
@@ -907,40 +907,40 @@ discard block |
||
| 907 | 907 | if ($direction == 'buy') // buy only for expense reports |
| 908 | 908 | { |
| 909 | 909 | // Define sql request |
| 910 | - $sql=''; |
|
| 910 | + $sql = ''; |
|
| 911 | 911 | |
| 912 | 912 | // Count on payments date |
| 913 | 913 | $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
| 914 | - $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 915 | - $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 916 | - $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 917 | - $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 918 | - $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e "; |
|
| 919 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 920 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 921 | - $sql.= " WHERE e.entity = " . $conf->entity; |
|
| 922 | - $sql.= " AND e.fk_statut in (6)"; |
|
| 914 | + $sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, "; |
|
| 915 | + $sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,"; |
|
| 916 | + $sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,"; |
|
| 917 | + $sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref"; |
|
| 918 | + $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e "; |
|
| 919 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid "; |
|
| 920 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid "; |
|
| 921 | + $sql .= " WHERE e.entity = ".$conf->entity; |
|
| 922 | + $sql .= " AND e.fk_statut in (6)"; |
|
| 923 | 923 | if ($y && $m) |
| 924 | 924 | { |
| 925 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
|
| 926 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
|
| 925 | + $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'"; |
|
| 926 | + $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'"; |
|
| 927 | 927 | } |
| 928 | 928 | else if ($y) |
| 929 | 929 | { |
| 930 | - $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
|
| 931 | - $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
|
| 930 | + $sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'"; |
|
| 931 | + $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'"; |
|
| 932 | 932 | } |
| 933 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 934 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 935 | - $sql.= " AND (d.product_type = -1"; |
|
| 936 | - $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 937 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 938 | - $sql.= " ORDER BY e.rowid"; |
|
| 939 | - |
|
| 940 | - if (! $sql) |
|
| 933 | + if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")"; |
|
| 934 | + if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 935 | + $sql .= " AND (d.product_type = -1"; |
|
| 936 | + $sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
|
| 937 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 938 | + $sql .= " ORDER BY e.rowid"; |
|
| 939 | + |
|
| 940 | + if (!$sql) |
|
| 941 | 941 | { |
| 942 | - dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
|
| 943 | - return -1; // -1 = Not accountancy module enabled |
|
| 942 | + dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR); |
|
| 943 | + return -1; // -1 = Not accountancy module enabled |
|
| 944 | 944 | } |
| 945 | 945 | if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
| 946 | 946 | if ($sql != 'TODO') |
@@ -950,20 +950,20 @@ discard block |
||
| 950 | 950 | if ($resql) |
| 951 | 951 | { |
| 952 | 952 | $rate = -1; |
| 953 | - $oldrowid=''; |
|
| 954 | - while($assoc = $db->fetch_array($resql)) |
|
| 953 | + $oldrowid = ''; |
|
| 954 | + while ($assoc = $db->fetch_array($resql)) |
|
| 955 | 955 | { |
| 956 | 956 | // Code to avoid warnings when array entry not defined |
| 957 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 958 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 959 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 960 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 957 | + if (!isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht'] = 0; |
|
| 958 | + if (!isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat'] = 0; |
|
| 959 | + if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0; |
|
| 960 | + if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0; |
|
| 961 | 961 | |
| 962 | 962 | if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
| 963 | 963 | { |
| 964 | - $oldrowid=$assoc['rowid']; |
|
| 964 | + $oldrowid = $assoc['rowid']; |
|
| 965 | 965 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 966 | - $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
|
| 966 | + $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
|
| 967 | 967 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
| 968 | 968 | $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2']; |
| 969 | 969 | } |
@@ -59,7 +59,9 @@ discard block |
||
| 59 | 59 | $nbLinks=Link::count($db, $object->element, $object->id); |
| 60 | 60 | $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; |
| 61 | 61 | $head[$h][1] = $langs->trans("Documents"); |
| 62 | - if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>'; |
|
| 62 | + if (($nbFiles+$nbLinks) > 0) { |
|
| 63 | + $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>'; |
|
| 64 | + } |
|
| 63 | 65 | $head[$h][2] = 'documents'; |
| 64 | 66 | $h++; |
| 65 | 67 | |
@@ -154,28 +156,35 @@ discard block |
||
| 154 | 156 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 155 | 157 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 156 | 158 | $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
| 157 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 158 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 159 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 160 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 161 | + } else { |
|
| 162 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 163 | + } |
|
| 159 | 164 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 160 | 165 | $sql.= " AND s.rowid = f.fk_soc"; |
| 161 | 166 | if ($y && $m) |
| 162 | 167 | { |
| 163 | 168 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 164 | 169 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 165 | - } |
|
| 166 | - else if ($y) |
|
| 170 | + } else if ($y) |
|
| 167 | 171 | { |
| 168 | 172 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 169 | 173 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 170 | 174 | } |
| 171 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 172 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 175 | + if ($q) { |
|
| 176 | + $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 177 | + } |
|
| 178 | + if ($date_start && $date_end) { |
|
| 179 | + $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 180 | + } |
|
| 173 | 181 | $sql.= " AND (d.product_type = 0"; // Limit to products |
| 174 | 182 | $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
| 175 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 183 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 184 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 185 | + } |
|
| 176 | 186 | $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
| 177 | - } |
|
| 178 | - else |
|
| 187 | + } else |
|
| 179 | 188 | { |
| 180 | 189 | // Count on payments date |
| 181 | 190 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -193,8 +202,11 @@ discard block |
||
| 193 | 202 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 194 | 203 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 195 | 204 | $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
| 196 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 197 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 205 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 206 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 207 | + } else { |
|
| 208 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 209 | + } |
|
| 198 | 210 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 199 | 211 | $sql.= " AND s.rowid = f.fk_soc"; |
| 200 | 212 | $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
@@ -203,22 +215,31 @@ discard block |
||
| 203 | 215 | { |
| 204 | 216 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 205 | 217 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 206 | - } |
|
| 207 | - else if ($y) |
|
| 218 | + } else if ($y) |
|
| 208 | 219 | { |
| 209 | 220 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 210 | 221 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 211 | 222 | } |
| 212 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 213 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 223 | + if ($q) { |
|
| 224 | + $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 225 | + } |
|
| 226 | + if ($date_start && $date_end) { |
|
| 227 | + $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 228 | + } |
|
| 214 | 229 | $sql.= " AND (d.product_type = 0"; // Limit to products |
| 215 | 230 | $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
| 216 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 231 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 232 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 233 | + } |
|
| 217 | 234 | $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
| 218 | 235 | } |
| 219 | 236 | |
| 220 | - if (! $sql) return -1; |
|
| 221 | - if ($sql == 'TODO') return -2; |
|
| 237 | + if (! $sql) { |
|
| 238 | + return -1; |
|
| 239 | + } |
|
| 240 | + if ($sql == 'TODO') { |
|
| 241 | + return -2; |
|
| 242 | + } |
|
| 222 | 243 | if ($sql != 'TODO') |
| 223 | 244 | { |
| 224 | 245 | dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG); |
@@ -230,14 +251,24 @@ discard block |
||
| 230 | 251 | $oldrowid=''; |
| 231 | 252 | while($assoc = $db->fetch_array($resql)) |
| 232 | 253 | { |
| 233 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 234 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 235 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 236 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 254 | + if (! isset($list[$assoc['company_id']]['totalht'])) { |
|
| 255 | + $list[$assoc['company_id']]['totalht']=0; |
|
| 256 | + } |
|
| 257 | + if (! isset($list[$assoc['company_id']]['vat'])) { |
|
| 258 | + $list[$assoc['company_id']]['vat']=0; |
|
| 259 | + } |
|
| 260 | + if (! isset($list[$assoc['company_id']]['localtax1'])) { |
|
| 261 | + $list[$assoc['company_id']]['localtax1']=0; |
|
| 262 | + } |
|
| 263 | + if (! isset($list[$assoc['company_id']]['localtax2'])) { |
|
| 264 | + $list[$assoc['company_id']]['localtax2']=0; |
|
| 265 | + } |
|
| 237 | 266 | |
| 238 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 267 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 268 | + // Si rupture sur d.rowid |
|
| 239 | 269 | { |
| 240 | 270 | $oldrowid=$assoc['rowid']; |
| 271 | + } |
|
| 241 | 272 | $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
| 242 | 273 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 243 | 274 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
@@ -273,8 +304,7 @@ discard block |
||
| 273 | 304 | |
| 274 | 305 | $company_id = $assoc['company_id']; |
| 275 | 306 | } |
| 276 | - } |
|
| 277 | - else |
|
| 307 | + } else |
|
| 278 | 308 | { |
| 279 | 309 | dol_print_error($db); |
| 280 | 310 | return -3; |
@@ -302,28 +332,35 @@ discard block |
||
| 302 | 332 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 303 | 333 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 304 | 334 | $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
| 305 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 306 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 335 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 336 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 337 | + } else { |
|
| 338 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 339 | + } |
|
| 307 | 340 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 308 | 341 | $sql.= " AND s.rowid = f.fk_soc"; |
| 309 | 342 | if ($y && $m) |
| 310 | 343 | { |
| 311 | 344 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 312 | 345 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 313 | - } |
|
| 314 | - else if ($y) |
|
| 346 | + } else if ($y) |
|
| 315 | 347 | { |
| 316 | 348 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 317 | 349 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 318 | 350 | } |
| 319 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 320 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 351 | + if ($q) { |
|
| 352 | + $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 353 | + } |
|
| 354 | + if ($date_start && $date_end) { |
|
| 355 | + $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 356 | + } |
|
| 321 | 357 | $sql.= " AND (d.product_type = 1"; // Limit to services |
| 322 | 358 | $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
| 323 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 359 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 360 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 361 | + } |
|
| 324 | 362 | $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
| 325 | - } |
|
| 326 | - else |
|
| 363 | + } else |
|
| 327 | 364 | { |
| 328 | 365 | // Count on payments date |
| 329 | 366 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -341,8 +378,11 @@ discard block |
||
| 341 | 378 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 342 | 379 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 343 | 380 | $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
| 344 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 345 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 381 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 382 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 383 | + } else { |
|
| 384 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 385 | + } |
|
| 346 | 386 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 347 | 387 | $sql.= " AND s.rowid = f.fk_soc"; |
| 348 | 388 | $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
@@ -351,17 +391,22 @@ discard block |
||
| 351 | 391 | { |
| 352 | 392 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 353 | 393 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 354 | - } |
|
| 355 | - else if ($y) |
|
| 394 | + } else if ($y) |
|
| 356 | 395 | { |
| 357 | 396 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 358 | 397 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 359 | 398 | } |
| 360 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 361 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 399 | + if ($q) { |
|
| 400 | + $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 401 | + } |
|
| 402 | + if ($date_start && $date_end) { |
|
| 403 | + $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 404 | + } |
|
| 362 | 405 | $sql.= " AND (d.product_type = 1"; // Limit to services |
| 363 | 406 | $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
| 364 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 407 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 408 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 409 | + } |
|
| 365 | 410 | $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
| 366 | 411 | } |
| 367 | 412 | |
@@ -370,7 +415,10 @@ discard block |
||
| 370 | 415 | dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
| 371 | 416 | return -1; // -1 = Not accountancy module enabled |
| 372 | 417 | } |
| 373 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 418 | + if ($sql == 'TODO') { |
|
| 419 | + return -2; |
|
| 420 | + } |
|
| 421 | + // -2 = Feature not yet available |
|
| 374 | 422 | if ($sql != 'TODO') |
| 375 | 423 | { |
| 376 | 424 | dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
@@ -381,14 +429,24 @@ discard block |
||
| 381 | 429 | $oldrowid=''; |
| 382 | 430 | while($assoc = $db->fetch_array($resql)) |
| 383 | 431 | { |
| 384 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 385 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 386 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 387 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 432 | + if (! isset($list[$assoc['company_id']]['totalht'])) { |
|
| 433 | + $list[$assoc['company_id']]['totalht']=0; |
|
| 434 | + } |
|
| 435 | + if (! isset($list[$assoc['company_id']]['vat'])) { |
|
| 436 | + $list[$assoc['company_id']]['vat']=0; |
|
| 437 | + } |
|
| 438 | + if (! isset($list[$assoc['company_id']]['localtax1'])) { |
|
| 439 | + $list[$assoc['company_id']]['localtax1']=0; |
|
| 440 | + } |
|
| 441 | + if (! isset($list[$assoc['company_id']]['localtax2'])) { |
|
| 442 | + $list[$assoc['company_id']]['localtax2']=0; |
|
| 443 | + } |
|
| 388 | 444 | |
| 389 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 445 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 446 | + // Si rupture sur d.rowid |
|
| 390 | 447 | { |
| 391 | 448 | $oldrowid=$assoc['rowid']; |
| 449 | + } |
|
| 392 | 450 | $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
| 393 | 451 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 394 | 452 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
@@ -424,8 +482,7 @@ discard block |
||
| 424 | 482 | |
| 425 | 483 | $company_id = $assoc['company_id']; |
| 426 | 484 | } |
| 427 | - } |
|
| 428 | - else |
|
| 485 | + } else |
|
| 429 | 486 | { |
| 430 | 487 | dol_print_error($db); |
| 431 | 488 | return -3; |
@@ -435,10 +492,12 @@ discard block |
||
| 435 | 492 | |
| 436 | 493 | // CASE OF EXPENSE REPORT |
| 437 | 494 | |
| 438 | - if ($direction == 'buy') // buy only for expense reports |
|
| 495 | + if ($direction == 'buy') { |
|
| 496 | + // buy only for expense reports |
|
| 439 | 497 | { |
| 440 | 498 | // Define sql request |
| 441 | 499 | $sql=''; |
| 500 | + } |
|
| 442 | 501 | |
| 443 | 502 | // Count on payments date |
| 444 | 503 | $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
@@ -455,17 +514,22 @@ discard block |
||
| 455 | 514 | { |
| 456 | 515 | $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 457 | 516 | $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 458 | - } |
|
| 459 | - else if ($y) |
|
| 517 | + } else if ($y) |
|
| 460 | 518 | { |
| 461 | 519 | $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 462 | 520 | $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 463 | 521 | } |
| 464 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 465 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 522 | + if ($q) { |
|
| 523 | + $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 524 | + } |
|
| 525 | + if ($date_start && $date_end) { |
|
| 526 | + $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 527 | + } |
|
| 466 | 528 | $sql.= " AND (d.product_type = -1"; |
| 467 | 529 | $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
| 468 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 530 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 531 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 532 | + } |
|
| 469 | 533 | $sql.= " ORDER BY e.rowid"; |
| 470 | 534 | |
| 471 | 535 | if (! $sql) |
@@ -473,7 +537,10 @@ discard block |
||
| 473 | 537 | dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
| 474 | 538 | return -1; // -1 = Not accountancy module enabled |
| 475 | 539 | } |
| 476 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 540 | + if ($sql == 'TODO') { |
|
| 541 | + return -2; |
|
| 542 | + } |
|
| 543 | + // -2 = Feature not yet available |
|
| 477 | 544 | if ($sql != 'TODO') |
| 478 | 545 | { |
| 479 | 546 | dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
@@ -484,14 +551,24 @@ discard block |
||
| 484 | 551 | $oldrowid=''; |
| 485 | 552 | while($assoc = $db->fetch_array($resql)) |
| 486 | 553 | { |
| 487 | - if (! isset($list[$assoc['company_id']]['totalht'])) $list[$assoc['company_id']]['totalht']=0; |
|
| 488 | - if (! isset($list[$assoc['company_id']]['vat'])) $list[$assoc['company_id']]['vat']=0; |
|
| 489 | - if (! isset($list[$assoc['company_id']]['localtax1'])) $list[$assoc['company_id']]['localtax1']=0; |
|
| 490 | - if (! isset($list[$assoc['company_id']]['localtax2'])) $list[$assoc['company_id']]['localtax2']=0; |
|
| 554 | + if (! isset($list[$assoc['company_id']]['totalht'])) { |
|
| 555 | + $list[$assoc['company_id']]['totalht']=0; |
|
| 556 | + } |
|
| 557 | + if (! isset($list[$assoc['company_id']]['vat'])) { |
|
| 558 | + $list[$assoc['company_id']]['vat']=0; |
|
| 559 | + } |
|
| 560 | + if (! isset($list[$assoc['company_id']]['localtax1'])) { |
|
| 561 | + $list[$assoc['company_id']]['localtax1']=0; |
|
| 562 | + } |
|
| 563 | + if (! isset($list[$assoc['company_id']]['localtax2'])) { |
|
| 564 | + $list[$assoc['company_id']]['localtax2']=0; |
|
| 565 | + } |
|
| 491 | 566 | |
| 492 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 567 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 568 | + // Si rupture sur d.rowid |
|
| 493 | 569 | { |
| 494 | 570 | $oldrowid=$assoc['rowid']; |
| 571 | + } |
|
| 495 | 572 | $list[$assoc['company_id']]['totalht'] += $assoc['total_ht']; |
| 496 | 573 | $list[$assoc['company_id']]['vat'] += $assoc['total_vat']; |
| 497 | 574 | $list[$assoc['company_id']]['localtax1'] += $assoc['total_localtax1']; |
@@ -528,8 +605,7 @@ discard block |
||
| 528 | 605 | |
| 529 | 606 | $company_id = $assoc['company_id']; |
| 530 | 607 | } |
| 531 | - } |
|
| 532 | - else |
|
| 608 | + } else |
|
| 533 | 609 | { |
| 534 | 610 | dol_print_error($db); |
| 535 | 611 | return -3; |
@@ -579,8 +655,7 @@ discard block |
||
| 579 | 655 | $paymenttable='paiement'; |
| 580 | 656 | $paymentfacturetable='paiement_facture'; |
| 581 | 657 | $invoicefieldref='ref'; |
| 582 | - } |
|
| 583 | - else |
|
| 658 | + } else |
|
| 584 | 659 | { |
| 585 | 660 | $invoicetable='facture_fourn'; |
| 586 | 661 | $invoicedettable='facture_fourn_det'; |
@@ -623,28 +698,35 @@ discard block |
||
| 623 | 698 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 624 | 699 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 625 | 700 | $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
| 626 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 627 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 701 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 702 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 703 | + } else { |
|
| 704 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 705 | + } |
|
| 628 | 706 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 629 | 707 | $sql.= " AND s.rowid = f.fk_soc"; |
| 630 | 708 | if ($y && $m) |
| 631 | 709 | { |
| 632 | 710 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 633 | 711 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 634 | - } |
|
| 635 | - else if ($y) |
|
| 712 | + } else if ($y) |
|
| 636 | 713 | { |
| 637 | 714 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 638 | 715 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 639 | 716 | } |
| 640 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 641 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 717 | + if ($q) { |
|
| 718 | + $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 719 | + } |
|
| 720 | + if ($date_start && $date_end) { |
|
| 721 | + $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 722 | + } |
|
| 642 | 723 | $sql.= " AND (d.product_type = 0"; // Limit to products |
| 643 | 724 | $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
| 644 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 725 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 726 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 727 | + } |
|
| 645 | 728 | $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
| 646 | - } |
|
| 647 | - else |
|
| 729 | + } else |
|
| 648 | 730 | { |
| 649 | 731 | // Count on payments date |
| 650 | 732 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -662,8 +744,11 @@ discard block |
||
| 662 | 744 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 663 | 745 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 664 | 746 | $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
| 665 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 666 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 747 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 748 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 749 | + } else { |
|
| 750 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 751 | + } |
|
| 667 | 752 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 668 | 753 | $sql.= " AND s.rowid = f.fk_soc"; |
| 669 | 754 | $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
@@ -672,22 +757,31 @@ discard block |
||
| 672 | 757 | { |
| 673 | 758 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 674 | 759 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 675 | - } |
|
| 676 | - else if ($y) |
|
| 760 | + } else if ($y) |
|
| 677 | 761 | { |
| 678 | 762 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 679 | 763 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 680 | 764 | } |
| 681 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 682 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 765 | + if ($q) { |
|
| 766 | + $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 767 | + } |
|
| 768 | + if ($date_start && $date_end) { |
|
| 769 | + $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 770 | + } |
|
| 683 | 771 | $sql.= " AND (d.product_type = 0"; // Limit to products |
| 684 | 772 | $sql.= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products |
| 685 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 773 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 774 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 775 | + } |
|
| 686 | 776 | $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
| 687 | 777 | } |
| 688 | 778 | |
| 689 | - if (! $sql) return -1; |
|
| 690 | - if ($sql == 'TODO') return -2; |
|
| 779 | + if (! $sql) { |
|
| 780 | + return -1; |
|
| 781 | + } |
|
| 782 | + if ($sql == 'TODO') { |
|
| 783 | + return -2; |
|
| 784 | + } |
|
| 691 | 785 | if ($sql != 'TODO') |
| 692 | 786 | { |
| 693 | 787 | dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
@@ -700,14 +794,24 @@ discard block |
||
| 700 | 794 | while($assoc = $db->fetch_array($resql)) |
| 701 | 795 | { |
| 702 | 796 | // Code to avoid warnings when array entry not defined |
| 703 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 704 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 705 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 706 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 797 | + if (! isset($list[$assoc['rate']]['totalht'])) { |
|
| 798 | + $list[$assoc['rate']]['totalht']=0; |
|
| 799 | + } |
|
| 800 | + if (! isset($list[$assoc['rate']]['vat'])) { |
|
| 801 | + $list[$assoc['rate']]['vat']=0; |
|
| 802 | + } |
|
| 803 | + if (! isset($list[$assoc['rate']]['localtax1'])) { |
|
| 804 | + $list[$assoc['rate']]['localtax1']=0; |
|
| 805 | + } |
|
| 806 | + if (! isset($list[$assoc['rate']]['localtax2'])) { |
|
| 807 | + $list[$assoc['rate']]['localtax2']=0; |
|
| 808 | + } |
|
| 707 | 809 | |
| 708 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 810 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 811 | + // Si rupture sur d.rowid |
|
| 709 | 812 | { |
| 710 | 813 | $oldrowid=$assoc['rowid']; |
| 814 | + } |
|
| 711 | 815 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 712 | 816 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 713 | 817 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
@@ -742,8 +846,7 @@ discard block |
||
| 742 | 846 | |
| 743 | 847 | $rate = $assoc['rate']; |
| 744 | 848 | } |
| 745 | - } |
|
| 746 | - else |
|
| 849 | + } else |
|
| 747 | 850 | { |
| 748 | 851 | dol_print_error($db); |
| 749 | 852 | return -3; |
@@ -771,28 +874,35 @@ discard block |
||
| 771 | 874 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 772 | 875 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 773 | 876 | $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely) |
| 774 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 775 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 877 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 878 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 879 | + } else { |
|
| 880 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 881 | + } |
|
| 776 | 882 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 777 | 883 | $sql.= " AND s.rowid = f.fk_soc"; |
| 778 | 884 | if ($y && $m) |
| 779 | 885 | { |
| 780 | 886 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 781 | 887 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 782 | - } |
|
| 783 | - else if ($y) |
|
| 888 | + } else if ($y) |
|
| 784 | 889 | { |
| 785 | 890 | $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 786 | 891 | $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 787 | 892 | } |
| 788 | - if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 789 | - if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 893 | + if ($q) { |
|
| 894 | + $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")"; |
|
| 895 | + } |
|
| 896 | + if ($date_start && $date_end) { |
|
| 897 | + $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; |
|
| 898 | + } |
|
| 790 | 899 | $sql.= " AND (d.product_type = 1"; // Limit to services |
| 791 | 900 | $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
| 792 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 901 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 902 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 903 | + } |
|
| 793 | 904 | $sql.= " ORDER BY d.rowid, d.".$fk_facture; |
| 794 | - } |
|
| 795 | - else |
|
| 905 | + } else |
|
| 796 | 906 | { |
| 797 | 907 | // Count on payments date |
| 798 | 908 | $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,"; |
@@ -810,8 +920,11 @@ discard block |
||
| 810 | 920 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid"; |
| 811 | 921 | $sql.= " WHERE f.entity = " . $conf->entity; |
| 812 | 922 | $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely) |
| 813 | - if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 814 | - else $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 923 | + if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { |
|
| 924 | + $sql.= " AND f.type IN (0,1,2,5)"; |
|
| 925 | + } else { |
|
| 926 | + $sql.= " AND f.type IN (0,1,2,3,5)"; |
|
| 927 | + } |
|
| 815 | 928 | $sql.= " AND f.rowid = d.".$fk_facture; |
| 816 | 929 | $sql.= " AND s.rowid = f.fk_soc"; |
| 817 | 930 | $sql.= " AND pf.".$fk_facture2." = f.rowid"; |
@@ -820,17 +933,22 @@ discard block |
||
| 820 | 933 | { |
| 821 | 934 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 822 | 935 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 823 | - } |
|
| 824 | - else if ($y) |
|
| 936 | + } else if ($y) |
|
| 825 | 937 | { |
| 826 | 938 | $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 827 | 939 | $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 828 | 940 | } |
| 829 | - if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 830 | - if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 941 | + if ($q) { |
|
| 942 | + $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")"; |
|
| 943 | + } |
|
| 944 | + if ($date_start && $date_end) { |
|
| 945 | + $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'"; |
|
| 946 | + } |
|
| 831 | 947 | $sql.= " AND (d.product_type = 1"; // Limit to services |
| 832 | 948 | $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service |
| 833 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 949 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 950 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)"; |
|
| 951 | + } |
|
| 834 | 952 | $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid"; |
| 835 | 953 | } |
| 836 | 954 | |
@@ -839,7 +957,10 @@ discard block |
||
| 839 | 957 | dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
| 840 | 958 | return -1; // -1 = Not accountancy module enabled |
| 841 | 959 | } |
| 842 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 960 | + if ($sql == 'TODO') { |
|
| 961 | + return -2; |
|
| 962 | + } |
|
| 963 | + // -2 = Feature not yet available |
|
| 843 | 964 | if ($sql != 'TODO') |
| 844 | 965 | { |
| 845 | 966 | dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
@@ -851,14 +972,24 @@ discard block |
||
| 851 | 972 | while($assoc = $db->fetch_array($resql)) |
| 852 | 973 | { |
| 853 | 974 | // Code to avoid warnings when array entry not defined |
| 854 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 855 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 856 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 857 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 975 | + if (! isset($list[$assoc['rate']]['totalht'])) { |
|
| 976 | + $list[$assoc['rate']]['totalht']=0; |
|
| 977 | + } |
|
| 978 | + if (! isset($list[$assoc['rate']]['vat'])) { |
|
| 979 | + $list[$assoc['rate']]['vat']=0; |
|
| 980 | + } |
|
| 981 | + if (! isset($list[$assoc['rate']]['localtax1'])) { |
|
| 982 | + $list[$assoc['rate']]['localtax1']=0; |
|
| 983 | + } |
|
| 984 | + if (! isset($list[$assoc['rate']]['localtax2'])) { |
|
| 985 | + $list[$assoc['rate']]['localtax2']=0; |
|
| 986 | + } |
|
| 858 | 987 | |
| 859 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 988 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 989 | + // Si rupture sur d.rowid |
|
| 860 | 990 | { |
| 861 | 991 | $oldrowid=$assoc['rowid']; |
| 992 | + } |
|
| 862 | 993 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 863 | 994 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 864 | 995 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
@@ -893,8 +1024,7 @@ discard block |
||
| 893 | 1024 | |
| 894 | 1025 | $rate = $assoc['rate']; |
| 895 | 1026 | } |
| 896 | - } |
|
| 897 | - else |
|
| 1027 | + } else |
|
| 898 | 1028 | { |
| 899 | 1029 | dol_print_error($db); |
| 900 | 1030 | return -3; |
@@ -904,10 +1034,12 @@ discard block |
||
| 904 | 1034 | |
| 905 | 1035 | // CASE OF EXPENSE REPORT |
| 906 | 1036 | |
| 907 | - if ($direction == 'buy') // buy only for expense reports |
|
| 1037 | + if ($direction == 'buy') { |
|
| 1038 | + // buy only for expense reports |
|
| 908 | 1039 | { |
| 909 | 1040 | // Define sql request |
| 910 | 1041 | $sql=''; |
| 1042 | + } |
|
| 911 | 1043 | |
| 912 | 1044 | // Count on payments date |
| 913 | 1045 | $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,"; |
@@ -924,17 +1056,22 @@ discard block |
||
| 924 | 1056 | { |
| 925 | 1057 | $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'"; |
| 926 | 1058 | $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'"; |
| 927 | - } |
|
| 928 | - else if ($y) |
|
| 1059 | + } else if ($y) |
|
| 929 | 1060 | { |
| 930 | 1061 | $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'"; |
| 931 | 1062 | $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'"; |
| 932 | 1063 | } |
| 933 | - if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 934 | - if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 1064 | + if ($q) { |
|
| 1065 | + $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")"; |
|
| 1066 | + } |
|
| 1067 | + if ($date_start && $date_end) { |
|
| 1068 | + $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; |
|
| 1069 | + } |
|
| 935 | 1070 | $sql.= " AND (d.product_type = -1"; |
| 936 | 1071 | $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service |
| 937 | - if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 1072 | + if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) { |
|
| 1073 | + $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)"; |
|
| 1074 | + } |
|
| 938 | 1075 | $sql.= " ORDER BY e.rowid"; |
| 939 | 1076 | |
| 940 | 1077 | if (! $sql) |
@@ -942,7 +1079,10 @@ discard block |
||
| 942 | 1079 | dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR); |
| 943 | 1080 | return -1; // -1 = Not accountancy module enabled |
| 944 | 1081 | } |
| 945 | - if ($sql == 'TODO') return -2; // -2 = Feature not yet available |
|
| 1082 | + if ($sql == 'TODO') { |
|
| 1083 | + return -2; |
|
| 1084 | + } |
|
| 1085 | + // -2 = Feature not yet available |
|
| 946 | 1086 | if ($sql != 'TODO') |
| 947 | 1087 | { |
| 948 | 1088 | dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG); |
@@ -954,14 +1094,24 @@ discard block |
||
| 954 | 1094 | while($assoc = $db->fetch_array($resql)) |
| 955 | 1095 | { |
| 956 | 1096 | // Code to avoid warnings when array entry not defined |
| 957 | - if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; |
|
| 958 | - if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; |
|
| 959 | - if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; |
|
| 960 | - if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; |
|
| 1097 | + if (! isset($list[$assoc['rate']]['totalht'])) { |
|
| 1098 | + $list[$assoc['rate']]['totalht']=0; |
|
| 1099 | + } |
|
| 1100 | + if (! isset($list[$assoc['rate']]['vat'])) { |
|
| 1101 | + $list[$assoc['rate']]['vat']=0; |
|
| 1102 | + } |
|
| 1103 | + if (! isset($list[$assoc['rate']]['localtax1'])) { |
|
| 1104 | + $list[$assoc['rate']]['localtax1']=0; |
|
| 1105 | + } |
|
| 1106 | + if (! isset($list[$assoc['rate']]['localtax2'])) { |
|
| 1107 | + $list[$assoc['rate']]['localtax2']=0; |
|
| 1108 | + } |
|
| 961 | 1109 | |
| 962 | - if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid |
|
| 1110 | + if ($assoc['rowid'] != $oldrowid) { |
|
| 1111 | + // Si rupture sur d.rowid |
|
| 963 | 1112 | { |
| 964 | 1113 | $oldrowid=$assoc['rowid']; |
| 1114 | + } |
|
| 965 | 1115 | $list[$assoc['rate']]['totalht'] += $assoc['total_ht']; |
| 966 | 1116 | $list[$assoc['rate']]['vat'] += $assoc['total_vat']; |
| 967 | 1117 | $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1']; |
@@ -997,8 +1147,7 @@ discard block |
||
| 997 | 1147 | |
| 998 | 1148 | $rate = $assoc['rate']; |
| 999 | 1149 | } |
| 1000 | - } |
|
| 1001 | - else |
|
| 1150 | + } else |
|
| 1002 | 1151 | { |
| 1003 | 1152 | dol_print_error($db); |
| 1004 | 1153 | return -3; |
@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | // Input search_htmlname is original field |
| 57 | 57 | // Input htmlname is a second input field used when using ajax autocomplete. |
| 58 | - $script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />'; |
|
| 58 | + $script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />'; |
|
| 59 | 59 | |
| 60 | - $script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n"; |
|
| 61 | - $script.= '<script type="text/javascript">'."\n"; |
|
| 62 | - $script.= '$(document).ready(function() { |
|
| 60 | + $script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n"; |
|
| 61 | + $script.= '<script type="text/javascript">'."\n"; |
|
| 62 | + $script.= '$(document).ready(function() { |
|
| 63 | 63 | var autoselect = '.$autoselect.'; |
| 64 | 64 | var options = '.json_encode($ajaxoptions).'; |
| 65 | 65 | |
@@ -202,9 +202,9 @@ discard block |
||
| 202 | 202 | }; |
| 203 | 203 | |
| 204 | 204 | });'; |
| 205 | - $script.= '</script>'; |
|
| 205 | + $script.= '</script>'; |
|
| 206 | 206 | |
| 207 | - return $script; |
|
| 207 | + return $script; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
@@ -223,9 +223,9 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0) |
| 225 | 225 | { |
| 226 | - $script = '<!-- Autocomplete -->'."\n"; |
|
| 227 | - $script.= '<script type="text/javascript">'; |
|
| 228 | - $script.= 'jQuery(document).ready(function() { |
|
| 226 | + $script = '<!-- Autocomplete -->'."\n"; |
|
| 227 | + $script.= '<script type="text/javascript">'; |
|
| 228 | + $script.= 'jQuery(document).ready(function() { |
|
| 229 | 229 | var fields = '.json_encode($fields).'; |
| 230 | 230 | var nboffields = fields.length; |
| 231 | 231 | var autoselect = '.$autoselect.'; |
@@ -314,9 +314,9 @@ discard block |
||
| 314 | 314 | } |
| 315 | 315 | }); |
| 316 | 316 | });'; |
| 317 | - $script.= '</script>'; |
|
| 317 | + $script.= '</script>'; |
|
| 318 | 318 | |
| 319 | - return $script; |
|
| 319 | + return $script; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | /** |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | */ |
| 331 | 331 | function ajax_dialog($title,$message,$w=350,$h=150) |
| 332 | 332 | { |
| 333 | - global $langs; |
|
| 333 | + global $langs; |
|
| 334 | 334 | |
| 335 | - $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title; |
|
| 336 | - $msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">'; |
|
| 337 | - $msg.= $message; |
|
| 338 | - $msg.= '</div>'."\n"; |
|
| 335 | + $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title; |
|
| 336 | + $msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">'; |
|
| 337 | + $msg.= $message; |
|
| 338 | + $msg.= '</div>'."\n"; |
|
| 339 | 339 | $msg.= '<script type="text/javascript"> |
| 340 | 340 | jQuery(function() { |
| 341 | 341 | jQuery("#dialog-info").dialog({ |
@@ -373,17 +373,17 @@ discard block |
||
| 373 | 373 | */ |
| 374 | 374 | function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve') |
| 375 | 375 | { |
| 376 | - global $conf; |
|
| 376 | + global $conf; |
|
| 377 | 377 | |
| 378 | - // select2 disabled for smartphones with standard browser. |
|
| 379 | - // TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array) |
|
| 380 | - if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return ''; |
|
| 378 | + // select2 disabled for smartphones with standard browser. |
|
| 379 | + // TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array) |
|
| 380 | + if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return ''; |
|
| 381 | 381 | |
| 382 | - if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; |
|
| 383 | - if (empty($conf->use_javascript_ajax)) return ''; |
|
| 384 | - if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return ''; |
|
| 382 | + if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; |
|
| 383 | + if (empty($conf->use_javascript_ajax)) return ''; |
|
| 384 | + if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return ''; |
|
| 385 | 385 | |
| 386 | - if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; |
|
| 386 | + if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; |
|
| 387 | 387 | |
| 388 | 388 | $tmpplugin='select2'; |
| 389 | 389 | $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' --> |
@@ -410,12 +410,12 @@ discard block |
||
| 410 | 410 | }, |
| 411 | 411 | dropdownCssClass: \'ui-dialog\' |
| 412 | 412 | })'; |
| 413 | - if ($forcefocus) $msg.= '.select2(\'focus\')'; |
|
| 414 | - $msg.= ';'."\n"; |
|
| 413 | + if ($forcefocus) $msg.= '.select2(\'focus\')'; |
|
| 414 | + $msg.= ';'."\n"; |
|
| 415 | 415 | |
| 416 | - if (is_array($events) && count($events)) // If an array of js events to do were provided. |
|
| 417 | - { |
|
| 418 | - $msg.= ' |
|
| 416 | + if (is_array($events) && count($events)) // If an array of js events to do were provided. |
|
| 417 | + { |
|
| 418 | + $msg.= ' |
|
| 419 | 419 | jQuery("#'.$htmlname.'").change(function () { |
| 420 | 420 | var obj = '.json_encode($events).'; |
| 421 | 421 | $.each(obj, function(key,values) { |
@@ -462,9 +462,9 @@ discard block |
||
| 462 | 462 | } |
| 463 | 463 | ); |
| 464 | 464 | }'; |
| 465 | - } |
|
| 465 | + } |
|
| 466 | 466 | |
| 467 | - $msg.= '});'."\n"; |
|
| 467 | + $msg.= '});'."\n"; |
|
| 468 | 468 | $msg.= "</script>\n"; |
| 469 | 469 | |
| 470 | 470 | return $msg; |
@@ -482,18 +482,18 @@ discard block |
||
| 482 | 482 | */ |
| 483 | 483 | function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0) |
| 484 | 484 | { |
| 485 | - global $conf, $langs; |
|
| 486 | - |
|
| 487 | - $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity); |
|
| 488 | - |
|
| 489 | - if (empty($conf->use_javascript_ajax)) |
|
| 490 | - { |
|
| 491 | - if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; |
|
| 492 | - else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>'; |
|
| 493 | - } |
|
| 494 | - else |
|
| 495 | - { |
|
| 496 | - $out= "\n<!-- Ajax code to switch constant ".$code." -->".' |
|
| 485 | + global $conf, $langs; |
|
| 486 | + |
|
| 487 | + $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity); |
|
| 488 | + |
|
| 489 | + if (empty($conf->use_javascript_ajax)) |
|
| 490 | + { |
|
| 491 | + if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; |
|
| 492 | + else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>'; |
|
| 493 | + } |
|
| 494 | + else |
|
| 495 | + { |
|
| 496 | + $out= "\n<!-- Ajax code to switch constant ".$code." -->".' |
|
| 497 | 497 | <script type="text/javascript"> |
| 498 | 498 | $(document).ready(function() { |
| 499 | 499 | var input = '.json_encode($input).'; |
@@ -528,13 +528,13 @@ discard block |
||
| 528 | 528 | }); |
| 529 | 529 | </script>'."\n"; |
| 530 | 530 | |
| 531 | - $out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>'; |
|
| 532 | - $out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>'; |
|
| 533 | - $out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>'; |
|
| 534 | - $out.="\n"; |
|
| 535 | - } |
|
| 531 | + $out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>'; |
|
| 532 | + $out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>'; |
|
| 533 | + $out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>'; |
|
| 534 | + $out.="\n"; |
|
| 535 | + } |
|
| 536 | 536 | |
| 537 | - return $out; |
|
| 537 | + return $out; |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | /** |
@@ -43,23 +43,23 @@ discard block |
||
| 43 | 43 | * - Ex: array('option_disabled'=> id to disable and warning to show if we select a disabled value (this is possible when using autocomplete ajax) |
| 44 | 44 | * @return string Script |
| 45 | 45 | */ |
| 46 | -function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array()) |
|
| 46 | +function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array()) |
|
| 47 | 47 | { |
| 48 | - if (empty($minLength)) $minLength=1; |
|
| 48 | + if (empty($minLength)) $minLength = 1; |
|
| 49 | 49 | |
| 50 | - $dataforrenderITem='ui-autocomplete'; |
|
| 51 | - $dataforitem='ui-autocomplete-item'; |
|
| 50 | + $dataforrenderITem = 'ui-autocomplete'; |
|
| 51 | + $dataforitem = 'ui-autocomplete-item'; |
|
| 52 | 52 | // Allow two constant to use other values for backward compatibility |
| 53 | - if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem=constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM'); |
|
| 54 | - if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) $dataforitem=constant('JS_QUERY_AUTOCOMPLETE_ITEM'); |
|
| 53 | + if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM'); |
|
| 54 | + if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM'); |
|
| 55 | 55 | |
| 56 | 56 | // Input search_htmlname is original field |
| 57 | 57 | // Input htmlname is a second input field used when using ajax autocomplete. |
| 58 | 58 | $script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />'; |
| 59 | 59 | |
| 60 | - $script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n"; |
|
| 61 | - $script.= '<script type="text/javascript">'."\n"; |
|
| 62 | - $script.= '$(document).ready(function() { |
|
| 60 | + $script .= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n"; |
|
| 61 | + $script .= '<script type="text/javascript">'."\n"; |
|
| 62 | + $script .= '$(document).ready(function() { |
|
| 63 | 63 | var autoselect = '.$autoselect.'; |
| 64 | 64 | var options = '.json_encode($ajaxoptions).'; |
| 65 | 65 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | }); |
| 110 | 110 | $("input#search_'.$htmlname.'").autocomplete({ |
| 111 | 111 | source: function( request, response ) { |
| 112 | - $.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){ |
|
| 112 | + $.get("'.$url.($urloption ? '?'.$urloption : '').'", { '.$htmlname.': request.term }, function(data){ |
|
| 113 | 113 | if (data != null) |
| 114 | 114 | { |
| 115 | 115 | response($.map( data, function(item) { |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled } |
| 134 | 134 | })); |
| 135 | 135 | } |
| 136 | - else console.error("Error: Ajax url '.$url.($urloption?'?'.$urloption:'').' has returned an empty page. Should be an empty json array."); |
|
| 136 | + else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array."); |
|
| 137 | 137 | }, "json"); |
| 138 | 138 | }, |
| 139 | 139 | dataType: "json", |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | }; |
| 203 | 203 | |
| 204 | 204 | });'; |
| 205 | - $script.= '</script>'; |
|
| 205 | + $script .= '</script>'; |
|
| 206 | 206 | |
| 207 | 207 | return $script; |
| 208 | 208 | } |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | * @param int $autoselect Automatic selection if just one value |
| 222 | 222 | * @return string Script |
| 223 | 223 | */ |
| 224 | -function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0) |
|
| 224 | +function ajax_multiautocompleter($htmlname, $fields, $url, $option = '', $minLength = 2, $autoselect = 0) |
|
| 225 | 225 | { |
| 226 | 226 | $script = '<!-- Autocomplete -->'."\n"; |
| 227 | - $script.= '<script type="text/javascript">'; |
|
| 228 | - $script.= 'jQuery(document).ready(function() { |
|
| 227 | + $script .= '<script type="text/javascript">'; |
|
| 228 | + $script .= 'jQuery(document).ready(function() { |
|
| 229 | 229 | var fields = '.json_encode($fields).'; |
| 230 | 230 | var nboffields = fields.length; |
| 231 | 231 | var autoselect = '.$autoselect.'; |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | dataType: "json", |
| 236 | 236 | minLength: '.$minLength.', |
| 237 | 237 | source: function( request, response ) { |
| 238 | - jQuery.getJSON( "'.$url.($option?'?'.$option:'').'", { '.$htmlname.': request.term }, function(data){ |
|
| 238 | + jQuery.getJSON( "'.$url.($option ? '?'.$option : '').'", { '.$htmlname.': request.term }, function(data){ |
|
| 239 | 239 | response( jQuery.map( data, function( item ) { |
| 240 | 240 | if (autoselect == 1 && data.length == 1) { |
| 241 | 241 | jQuery("#'.$htmlname.'").val(item.value); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | } |
| 315 | 315 | }); |
| 316 | 316 | });'; |
| 317 | - $script.= '</script>'; |
|
| 317 | + $script .= '</script>'; |
|
| 318 | 318 | |
| 319 | 319 | return $script; |
| 320 | 320 | } |
@@ -328,15 +328,15 @@ discard block |
||
| 328 | 328 | * @param int $h height of dialog box |
| 329 | 329 | * @return void |
| 330 | 330 | */ |
| 331 | -function ajax_dialog($title,$message,$w=350,$h=150) |
|
| 331 | +function ajax_dialog($title, $message, $w = 350, $h = 150) |
|
| 332 | 332 | { |
| 333 | 333 | global $langs; |
| 334 | 334 | |
| 335 | - $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title; |
|
| 336 | - $msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">'; |
|
| 337 | - $msg.= $message; |
|
| 338 | - $msg.= '</div>'."\n"; |
|
| 339 | - $msg.= '<script type="text/javascript"> |
|
| 335 | + $newtitle = dol_textishtml($title) ?dol_string_nohtmltag($title, 1) : $title; |
|
| 336 | + $msg = '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">'; |
|
| 337 | + $msg .= $message; |
|
| 338 | + $msg .= '</div>'."\n"; |
|
| 339 | + $msg .= '<script type="text/javascript"> |
|
| 340 | 340 | jQuery(function() { |
| 341 | 341 | jQuery("#dialog-info").dialog({ |
| 342 | 342 | resizable: false, |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | }); |
| 353 | 353 | </script>'; |
| 354 | 354 | |
| 355 | - $msg.= "\n"; |
|
| 355 | + $msg .= "\n"; |
|
| 356 | 356 | |
| 357 | 357 | return $msg; |
| 358 | 358 | } |
@@ -371,25 +371,25 @@ discard block |
||
| 371 | 371 | * @return string Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason. |
| 372 | 372 | * @see selectArrayAjax of html.form.class |
| 373 | 373 | */ |
| 374 | -function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve') |
|
| 374 | +function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve') |
|
| 375 | 375 | { |
| 376 | 376 | global $conf; |
| 377 | 377 | |
| 378 | 378 | // select2 disabled for smartphones with standard browser. |
| 379 | 379 | // TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array) |
| 380 | - if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return ''; |
|
| 380 | + if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone') return ''; |
|
| 381 | 381 | |
| 382 | - if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; |
|
| 382 | + if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; |
|
| 383 | 383 | if (empty($conf->use_javascript_ajax)) return ''; |
| 384 | - if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return ''; |
|
| 384 | + if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return ''; |
|
| 385 | 385 | |
| 386 | - if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; |
|
| 386 | + if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete = 0; |
|
| 387 | 387 | |
| 388 | - $tmpplugin='select2'; |
|
| 389 | - $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' --> |
|
| 388 | + $tmpplugin = 'select2'; |
|
| 389 | + $msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' --> |
|
| 390 | 390 | <script type="text/javascript"> |
| 391 | 391 | $(document).ready(function () { |
| 392 | - $(\''.(preg_match('/^\./',$htmlname)?$htmlname:'#'.$htmlname).'\').'.$tmpplugin.'({ |
|
| 392 | + $(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({ |
|
| 393 | 393 | dir: \'ltr\', |
| 394 | 394 | width: \''.$widthTypeOfAutocomplete.'\', /* off or resolve */ |
| 395 | 395 | minimumInputLength: '.$minLengthToAutocomplete.', |
@@ -410,12 +410,12 @@ discard block |
||
| 410 | 410 | }, |
| 411 | 411 | dropdownCssClass: \'ui-dialog\' |
| 412 | 412 | })'; |
| 413 | - if ($forcefocus) $msg.= '.select2(\'focus\')'; |
|
| 414 | - $msg.= ';'."\n"; |
|
| 413 | + if ($forcefocus) $msg .= '.select2(\'focus\')'; |
|
| 414 | + $msg .= ';'."\n"; |
|
| 415 | 415 | |
| 416 | 416 | if (is_array($events) && count($events)) // If an array of js events to do were provided. |
| 417 | 417 | { |
| 418 | - $msg.= ' |
|
| 418 | + $msg .= ' |
|
| 419 | 419 | jQuery("#'.$htmlname.'").change(function () { |
| 420 | 420 | var obj = '.json_encode($events).'; |
| 421 | 421 | $.each(obj, function(key,values) { |
@@ -464,8 +464,8 @@ discard block |
||
| 464 | 464 | }'; |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | - $msg.= '});'."\n"; |
|
| 468 | - $msg.= "</script>\n"; |
|
| 467 | + $msg .= '});'."\n"; |
|
| 468 | + $msg .= "</script>\n"; |
|
| 469 | 469 | |
| 470 | 470 | return $msg; |
| 471 | 471 | } |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | * @param bool $strict Use only "disabled" with delConstant and "enabled" with setConstant |
| 481 | 481 | * @return string |
| 482 | 482 | */ |
| 483 | -function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0) |
|
| 483 | +function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0) |
|
| 484 | 484 | { |
| 485 | 485 | global $conf, $langs; |
| 486 | 486 | |
@@ -488,12 +488,12 @@ discard block |
||
| 488 | 488 | |
| 489 | 489 | if (empty($conf->use_javascript_ajax)) |
| 490 | 490 | { |
| 491 | - if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; |
|
| 492 | - else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>'; |
|
| 491 | + if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>'; |
|
| 492 | + else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>'; |
|
| 493 | 493 | } |
| 494 | 494 | else |
| 495 | 495 | { |
| 496 | - $out= "\n<!-- Ajax code to switch constant ".$code." -->".' |
|
| 496 | + $out = "\n<!-- Ajax code to switch constant ".$code." -->".' |
|
| 497 | 497 | <script type="text/javascript"> |
| 498 | 498 | $(document).ready(function() { |
| 499 | 499 | var input = '.json_encode($input).'; |
@@ -528,10 +528,10 @@ discard block |
||
| 528 | 528 | }); |
| 529 | 529 | </script>'."\n"; |
| 530 | 530 | |
| 531 | - $out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>'; |
|
| 532 | - $out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>'; |
|
| 533 | - $out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>'; |
|
| 534 | - $out.="\n"; |
|
| 531 | + $out .= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>'; |
|
| 532 | + $out .= '<span id="set_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on') : img_picto($langs->trans("Disabled"), 'switch_off')).'</span>'; |
|
| 533 | + $out .= '<span id="del_'.$code.'" class="linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on')).'</span>'; |
|
| 534 | + $out .= "\n"; |
|
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | return $out; |
@@ -548,11 +548,11 @@ discard block |
||
| 548 | 548 | * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) |
| 549 | 549 | * @return string html for button on/off |
| 550 | 550 | */ |
| 551 | -function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array()) |
|
| 551 | +function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array()) |
|
| 552 | 552 | { |
| 553 | 553 | global $langs; |
| 554 | 554 | |
| 555 | - $out= '<script type="text/javascript"> |
|
| 555 | + $out = '<script type="text/javascript"> |
|
| 556 | 556 | $(function() { |
| 557 | 557 | var input = '.json_encode($input).'; |
| 558 | 558 | |
@@ -617,8 +617,8 @@ discard block |
||
| 617 | 617 | }); |
| 618 | 618 | }); |
| 619 | 619 | </script>'; |
| 620 | - $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans($text_off),'switch_off').'</span>'; |
|
| 621 | - $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans($text_on),'switch_on').'</span>'; |
|
| 620 | + $out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>'; |
|
| 621 | + $out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>'; |
|
| 622 | 622 | |
| 623 | 623 | return $out; |
| 624 | 624 | } |
@@ -45,13 +45,19 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array()) |
| 47 | 47 | { |
| 48 | - if (empty($minLength)) $minLength=1; |
|
| 48 | + if (empty($minLength)) { |
|
| 49 | + $minLength=1; |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | $dataforrenderITem='ui-autocomplete'; |
| 51 | 53 | $dataforitem='ui-autocomplete-item'; |
| 52 | 54 | // Allow two constant to use other values for backward compatibility |
| 53 | - if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem=constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM'); |
|
| 54 | - if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) $dataforitem=constant('JS_QUERY_AUTOCOMPLETE_ITEM'); |
|
| 55 | + if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) { |
|
| 56 | + $dataforrenderITem=constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM'); |
|
| 57 | + } |
|
| 58 | + if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) { |
|
| 59 | + $dataforitem=constant('JS_QUERY_AUTOCOMPLETE_ITEM'); |
|
| 60 | + } |
|
| 55 | 61 | |
| 56 | 62 | // Input search_htmlname is original field |
| 57 | 63 | // Input htmlname is a second input field used when using ajax autocomplete. |
@@ -377,13 +383,23 @@ discard block |
||
| 377 | 383 | |
| 378 | 384 | // select2 disabled for smartphones with standard browser. |
| 379 | 385 | // TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array) |
| 380 | - if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return ''; |
|
| 386 | + if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') { |
|
| 387 | + return ''; |
|
| 388 | + } |
|
| 381 | 389 | |
| 382 | - if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; |
|
| 383 | - if (empty($conf->use_javascript_ajax)) return ''; |
|
| 384 | - if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return ''; |
|
| 390 | + if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) { |
|
| 391 | + return ''; |
|
| 392 | + } |
|
| 393 | + if (empty($conf->use_javascript_ajax)) { |
|
| 394 | + return ''; |
|
| 395 | + } |
|
| 396 | + if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) { |
|
| 397 | + return ''; |
|
| 398 | + } |
|
| 385 | 399 | |
| 386 | - if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0; |
|
| 400 | + if (empty($minLengthToAutocomplete)) { |
|
| 401 | + $minLengthToAutocomplete=0; |
|
| 402 | + } |
|
| 387 | 403 | |
| 388 | 404 | $tmpplugin='select2'; |
| 389 | 405 | $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' --> |
@@ -410,10 +426,13 @@ discard block |
||
| 410 | 426 | }, |
| 411 | 427 | dropdownCssClass: \'ui-dialog\' |
| 412 | 428 | })'; |
| 413 | - if ($forcefocus) $msg.= '.select2(\'focus\')'; |
|
| 429 | + if ($forcefocus) { |
|
| 430 | + $msg.= '.select2(\'focus\')'; |
|
| 431 | + } |
|
| 414 | 432 | $msg.= ';'."\n"; |
| 415 | 433 | |
| 416 | - if (is_array($events) && count($events)) // If an array of js events to do were provided. |
|
| 434 | + if (is_array($events) && count($events)) { |
|
| 435 | + // If an array of js events to do were provided. |
|
| 417 | 436 | { |
| 418 | 437 | $msg.= ' |
| 419 | 438 | jQuery("#'.$htmlname.'").change(function () { |
@@ -463,6 +482,7 @@ discard block |
||
| 463 | 482 | ); |
| 464 | 483 | }'; |
| 465 | 484 | } |
| 485 | + } |
|
| 466 | 486 | |
| 467 | 487 | $msg.= '});'."\n"; |
| 468 | 488 | $msg.= "</script>\n"; |
@@ -488,10 +508,12 @@ discard block |
||
| 488 | 508 | |
| 489 | 509 | if (empty($conf->use_javascript_ajax)) |
| 490 | 510 | { |
| 491 | - if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; |
|
| 492 | - else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>'; |
|
| 493 | - } |
|
| 494 | - else |
|
| 511 | + if (empty($conf->global->$code)) { |
|
| 512 | + print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>'; |
|
| 513 | + } else { |
|
| 514 | + print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>'; |
|
| 515 | + } |
|
| 516 | + } else |
|
| 495 | 517 | { |
| 496 | 518 | $out= "\n<!-- Ajax code to switch constant ".$code." -->".' |
| 497 | 519 | <script type="text/javascript"> |
@@ -50,234 +50,234 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf') |
| 52 | 52 | { |
| 53 | - $sql = "SELECT DISTINCT f.rowid, f.ref"; |
|
| 54 | - $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; |
|
| 55 | - $sqlwhere=''; |
|
| 56 | - $sqlorder=''; |
|
| 57 | - if (in_array('all',$filter)) |
|
| 58 | - { |
|
| 59 | - $sqlorder = " ORDER BY f.ref ASC"; |
|
| 60 | - } |
|
| 61 | - if (in_array('date',$filter)) |
|
| 62 | - { |
|
| 63 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 64 | - else $sqlwhere.=" AND"; |
|
| 65 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 66 | - $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'"; |
|
| 67 | - $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'"; |
|
| 68 | - $sqlorder = " ORDER BY f.datef ASC"; |
|
| 69 | - } |
|
| 70 | - if (in_array('nopayment',$filter)) |
|
| 71 | - { |
|
| 72 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; |
|
| 73 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 74 | - else $sqlwhere.=" AND"; |
|
| 75 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 76 | - $sqlwhere.= " AND pf.fk_paiement IS NULL"; |
|
| 77 | - } |
|
| 78 | - if (in_array('payments',$filter) || in_array('bank',$filter)) |
|
| 79 | - { |
|
| 80 | - $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; |
|
| 81 | - if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 82 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 83 | - else $sqlwhere.=" AND"; |
|
| 84 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 85 | - $sqlwhere.= " AND f.rowid = pf.fk_facture"; |
|
| 86 | - $sqlwhere.= " AND pf.fk_paiement = p.rowid"; |
|
| 87 | - if (in_array('payments',$filter)) |
|
| 88 | - { |
|
| 89 | - $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'"; |
|
| 90 | - $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'"; |
|
| 91 | - } |
|
| 92 | - if (in_array('bank',$filter)) |
|
| 93 | - { |
|
| 94 | - $sqlwhere.= " AND p.fk_bank = b.rowid"; |
|
| 95 | - $sqlwhere.= " AND b.fk_account = ".$paymentbankid; |
|
| 96 | - } |
|
| 97 | - $sqlorder = " ORDER BY p.datep ASC"; |
|
| 98 | - } |
|
| 99 | - if (in_array('nodeposit',$filter)) |
|
| 100 | - { |
|
| 101 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 102 | - else $sqlwhere.=" AND"; |
|
| 103 | - $sqlwhere.=' type <> 3'; |
|
| 104 | - } |
|
| 105 | - if (in_array('noreplacement',$filter)) |
|
| 106 | - { |
|
| 107 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 108 | - else $sqlwhere.=" AND"; |
|
| 109 | - $sqlwhere.=' type <> 1'; |
|
| 110 | - } |
|
| 111 | - if (in_array('nocreditnote',$filter)) |
|
| 112 | - { |
|
| 113 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 114 | - else $sqlwhere.=" AND"; |
|
| 115 | - $sqlwhere.=' type <> 2'; |
|
| 116 | - } |
|
| 117 | - if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 118 | - { |
|
| 119 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 120 | - else $sqlwhere.=" AND"; |
|
| 121 | - $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')'; |
|
| 122 | - } |
|
| 123 | - if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 124 | - { |
|
| 125 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 126 | - else $sqlwhere.=" AND"; |
|
| 127 | - $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')'; |
|
| 128 | - } |
|
| 129 | - if ($sqlwhere) $sql.=$sqlwhere; |
|
| 130 | - if ($sqlorder) $sql.=$sqlorder; |
|
| 53 | + $sql = "SELECT DISTINCT f.rowid, f.ref"; |
|
| 54 | + $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; |
|
| 55 | + $sqlwhere=''; |
|
| 56 | + $sqlorder=''; |
|
| 57 | + if (in_array('all',$filter)) |
|
| 58 | + { |
|
| 59 | + $sqlorder = " ORDER BY f.ref ASC"; |
|
| 60 | + } |
|
| 61 | + if (in_array('date',$filter)) |
|
| 62 | + { |
|
| 63 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 64 | + else $sqlwhere.=" AND"; |
|
| 65 | + $sqlwhere.= " f.fk_statut > 0"; |
|
| 66 | + $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'"; |
|
| 67 | + $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'"; |
|
| 68 | + $sqlorder = " ORDER BY f.datef ASC"; |
|
| 69 | + } |
|
| 70 | + if (in_array('nopayment',$filter)) |
|
| 71 | + { |
|
| 72 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; |
|
| 73 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 74 | + else $sqlwhere.=" AND"; |
|
| 75 | + $sqlwhere.= " f.fk_statut > 0"; |
|
| 76 | + $sqlwhere.= " AND pf.fk_paiement IS NULL"; |
|
| 77 | + } |
|
| 78 | + if (in_array('payments',$filter) || in_array('bank',$filter)) |
|
| 79 | + { |
|
| 80 | + $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; |
|
| 81 | + if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 82 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 83 | + else $sqlwhere.=" AND"; |
|
| 84 | + $sqlwhere.= " f.fk_statut > 0"; |
|
| 85 | + $sqlwhere.= " AND f.rowid = pf.fk_facture"; |
|
| 86 | + $sqlwhere.= " AND pf.fk_paiement = p.rowid"; |
|
| 87 | + if (in_array('payments',$filter)) |
|
| 88 | + { |
|
| 89 | + $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'"; |
|
| 90 | + $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'"; |
|
| 91 | + } |
|
| 92 | + if (in_array('bank',$filter)) |
|
| 93 | + { |
|
| 94 | + $sqlwhere.= " AND p.fk_bank = b.rowid"; |
|
| 95 | + $sqlwhere.= " AND b.fk_account = ".$paymentbankid; |
|
| 96 | + } |
|
| 97 | + $sqlorder = " ORDER BY p.datep ASC"; |
|
| 98 | + } |
|
| 99 | + if (in_array('nodeposit',$filter)) |
|
| 100 | + { |
|
| 101 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 102 | + else $sqlwhere.=" AND"; |
|
| 103 | + $sqlwhere.=' type <> 3'; |
|
| 104 | + } |
|
| 105 | + if (in_array('noreplacement',$filter)) |
|
| 106 | + { |
|
| 107 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 108 | + else $sqlwhere.=" AND"; |
|
| 109 | + $sqlwhere.=' type <> 1'; |
|
| 110 | + } |
|
| 111 | + if (in_array('nocreditnote',$filter)) |
|
| 112 | + { |
|
| 113 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 114 | + else $sqlwhere.=" AND"; |
|
| 115 | + $sqlwhere.=' type <> 2'; |
|
| 116 | + } |
|
| 117 | + if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 118 | + { |
|
| 119 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 120 | + else $sqlwhere.=" AND"; |
|
| 121 | + $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')'; |
|
| 122 | + } |
|
| 123 | + if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 124 | + { |
|
| 125 | + if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 126 | + else $sqlwhere.=" AND"; |
|
| 127 | + $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')'; |
|
| 128 | + } |
|
| 129 | + if ($sqlwhere) $sql.=$sqlwhere; |
|
| 130 | + if ($sqlorder) $sql.=$sqlorder; |
|
| 131 | 131 | |
| 132 | - //print $sql; exit; |
|
| 133 | - dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG); |
|
| 132 | + //print $sql; exit; |
|
| 133 | + dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG); |
|
| 134 | 134 | |
| 135 | - if ($usestdout) print '--- start'."\n"; |
|
| 135 | + if ($usestdout) print '--- start'."\n"; |
|
| 136 | 136 | |
| 137 | - // Start of transaction |
|
| 138 | - //$db->begin(); |
|
| 137 | + // Start of transaction |
|
| 138 | + //$db->begin(); |
|
| 139 | 139 | |
| 140 | - $error = 0; |
|
| 141 | - $result = 0; |
|
| 142 | - $files = array() ; // liste les fichiers |
|
| 140 | + $error = 0; |
|
| 141 | + $result = 0; |
|
| 142 | + $files = array() ; // liste les fichiers |
|
| 143 | 143 | |
| 144 | - dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG); |
|
| 145 | - if ( $resql=$db->query($sql) ) |
|
| 146 | - { |
|
| 147 | - $num = $db->num_rows($resql); |
|
| 148 | - $cpt = 0; |
|
| 149 | - $oldemail = ''; |
|
| 150 | - $message = ''; |
|
| 151 | - $total = ''; |
|
| 144 | + dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG); |
|
| 145 | + if ( $resql=$db->query($sql) ) |
|
| 146 | + { |
|
| 147 | + $num = $db->num_rows($resql); |
|
| 148 | + $cpt = 0; |
|
| 149 | + $oldemail = ''; |
|
| 150 | + $message = ''; |
|
| 151 | + $total = ''; |
|
| 152 | 152 | |
| 153 | - if ($num) |
|
| 154 | - { |
|
| 155 | - // First loop on each resultset to build PDF |
|
| 156 | - // ----------------------------------------- |
|
| 153 | + if ($num) |
|
| 154 | + { |
|
| 155 | + // First loop on each resultset to build PDF |
|
| 156 | + // ----------------------------------------- |
|
| 157 | 157 | |
| 158 | - while ($cpt < $num) |
|
| 159 | - { |
|
| 160 | - $obj = $db->fetch_object($resql); |
|
| 158 | + while ($cpt < $num) |
|
| 159 | + { |
|
| 160 | + $obj = $db->fetch_object($resql); |
|
| 161 | 161 | |
| 162 | - $fac = new Facture($db); |
|
| 163 | - $result=$fac->fetch($obj->rowid); |
|
| 164 | - if ($result > 0) |
|
| 165 | - { |
|
| 166 | - $outputlangs = $langs; |
|
| 167 | - if (! empty($newlangid)) |
|
| 168 | - { |
|
| 169 | - if ($outputlangs->defaultlang != $newlangid) |
|
| 170 | - { |
|
| 171 | - $outputlangs = new Translate("",$conf); |
|
| 172 | - $outputlangs->setDefaultLang($newlangid); |
|
| 173 | - } |
|
| 174 | - } |
|
| 175 | - $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf'; |
|
| 176 | - if ($regenerate || ! dol_is_file($filename)) |
|
| 177 | - { |
|
| 178 | - if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n"; |
|
| 179 | - $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs); |
|
| 180 | - } |
|
| 181 | - else { |
|
| 182 | - if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n"; |
|
| 183 | - } |
|
| 162 | + $fac = new Facture($db); |
|
| 163 | + $result=$fac->fetch($obj->rowid); |
|
| 164 | + if ($result > 0) |
|
| 165 | + { |
|
| 166 | + $outputlangs = $langs; |
|
| 167 | + if (! empty($newlangid)) |
|
| 168 | + { |
|
| 169 | + if ($outputlangs->defaultlang != $newlangid) |
|
| 170 | + { |
|
| 171 | + $outputlangs = new Translate("",$conf); |
|
| 172 | + $outputlangs->setDefaultLang($newlangid); |
|
| 173 | + } |
|
| 174 | + } |
|
| 175 | + $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf'; |
|
| 176 | + if ($regenerate || ! dol_is_file($filename)) |
|
| 177 | + { |
|
| 178 | + if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n"; |
|
| 179 | + $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs); |
|
| 180 | + } |
|
| 181 | + else { |
|
| 182 | + if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n"; |
|
| 183 | + } |
|
| 184 | 184 | |
| 185 | - // Add file into files array |
|
| 186 | - $files[] = $filename; |
|
| 187 | - } |
|
| 185 | + // Add file into files array |
|
| 186 | + $files[] = $filename; |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | - if ($result <= 0) |
|
| 190 | - { |
|
| 191 | - $error++; |
|
| 192 | - if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n"; |
|
| 193 | - else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR); |
|
| 194 | - } |
|
| 189 | + if ($result <= 0) |
|
| 190 | + { |
|
| 191 | + $error++; |
|
| 192 | + if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n"; |
|
| 193 | + else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - $cpt++; |
|
| 197 | - } |
|
| 196 | + $cpt++; |
|
| 197 | + } |
|
| 198 | 198 | |
| 199 | 199 | |
| 200 | - // Define format of output PDF |
|
| 201 | - $formatarray=pdf_getFormat($langs); |
|
| 202 | - $page_largeur = $formatarray['width']; |
|
| 203 | - $page_hauteur = $formatarray['height']; |
|
| 204 | - $format = array($page_largeur,$page_hauteur); |
|
| 200 | + // Define format of output PDF |
|
| 201 | + $formatarray=pdf_getFormat($langs); |
|
| 202 | + $page_largeur = $formatarray['width']; |
|
| 203 | + $page_hauteur = $formatarray['height']; |
|
| 204 | + $format = array($page_largeur,$page_hauteur); |
|
| 205 | 205 | |
| 206 | - if ($usestdout) print "Using output PDF format ".join('x',$format)."\n"; |
|
| 207 | - else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR); |
|
| 206 | + if ($usestdout) print "Using output PDF format ".join('x',$format)."\n"; |
|
| 207 | + else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR); |
|
| 208 | 208 | |
| 209 | 209 | |
| 210 | - // Now, build a merged files with all files in $files array |
|
| 211 | - //--------------------------------------------------------- |
|
| 210 | + // Now, build a merged files with all files in $files array |
|
| 211 | + //--------------------------------------------------------- |
|
| 212 | 212 | |
| 213 | - // Create empty PDF |
|
| 214 | - $pdf=pdf_getInstance($format); |
|
| 215 | - if (class_exists('TCPDF')) |
|
| 216 | - { |
|
| 217 | - $pdf->setPrintHeader(false); |
|
| 218 | - $pdf->setPrintFooter(false); |
|
| 219 | - } |
|
| 220 | - $pdf->SetFont(pdf_getPDFFont($langs)); |
|
| 213 | + // Create empty PDF |
|
| 214 | + $pdf=pdf_getInstance($format); |
|
| 215 | + if (class_exists('TCPDF')) |
|
| 216 | + { |
|
| 217 | + $pdf->setPrintHeader(false); |
|
| 218 | + $pdf->setPrintFooter(false); |
|
| 219 | + } |
|
| 220 | + $pdf->SetFont(pdf_getPDFFont($langs)); |
|
| 221 | 221 | |
| 222 | - if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false); |
|
| 223 | - //$pdf->SetCompression(false); |
|
| 222 | + if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false); |
|
| 223 | + //$pdf->SetCompression(false); |
|
| 224 | 224 | |
| 225 | - // Add all others |
|
| 226 | - foreach($files as $file) |
|
| 227 | - { |
|
| 228 | - if ($usestdout) print "Merge PDF file for invoice ".$file."\n"; |
|
| 229 | - else dol_syslog("Merge PDF file for invoice ".$file); |
|
| 225 | + // Add all others |
|
| 226 | + foreach($files as $file) |
|
| 227 | + { |
|
| 228 | + if ($usestdout) print "Merge PDF file for invoice ".$file."\n"; |
|
| 229 | + else dol_syslog("Merge PDF file for invoice ".$file); |
|
| 230 | 230 | |
| 231 | - // Charge un document PDF depuis un fichier. |
|
| 232 | - $pagecount = $pdf->setSourceFile($file); |
|
| 233 | - for ($i = 1; $i <= $pagecount; $i++) |
|
| 234 | - { |
|
| 235 | - $tplidx = $pdf->importPage($i); |
|
| 236 | - $s = $pdf->getTemplatesize($tplidx); |
|
| 237 | - $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L'); |
|
| 238 | - $pdf->useTemplate($tplidx); |
|
| 239 | - } |
|
| 240 | - } |
|
| 231 | + // Charge un document PDF depuis un fichier. |
|
| 232 | + $pagecount = $pdf->setSourceFile($file); |
|
| 233 | + for ($i = 1; $i <= $pagecount; $i++) |
|
| 234 | + { |
|
| 235 | + $tplidx = $pdf->importPage($i); |
|
| 236 | + $s = $pdf->getTemplatesize($tplidx); |
|
| 237 | + $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L'); |
|
| 238 | + $pdf->useTemplate($tplidx); |
|
| 239 | + } |
|
| 240 | + } |
|
| 241 | 241 | |
| 242 | - // Create output dir if not exists |
|
| 243 | - dol_mkdir($diroutputpdf); |
|
| 242 | + // Create output dir if not exists |
|
| 243 | + dol_mkdir($diroutputpdf); |
|
| 244 | 244 | |
| 245 | - // Save merged file |
|
| 246 | - $filename=$fileprefix; |
|
| 247 | - if (empty($filename)) $filename='mergedpdf'; |
|
| 248 | - if (! empty($filesuffix)) $filename.='_'.$filesuffix; |
|
| 249 | - $file=$diroutputpdf.'/'.$filename.'.pdf'; |
|
| 245 | + // Save merged file |
|
| 246 | + $filename=$fileprefix; |
|
| 247 | + if (empty($filename)) $filename='mergedpdf'; |
|
| 248 | + if (! empty($filesuffix)) $filename.='_'.$filesuffix; |
|
| 249 | + $file=$diroutputpdf.'/'.$filename.'.pdf'; |
|
| 250 | 250 | |
| 251 | - if (! $error && $pagecount) |
|
| 252 | - { |
|
| 253 | - $pdf->Output($file,'F'); |
|
| 254 | - if (! empty($conf->global->MAIN_UMASK)) |
|
| 255 | - @chmod($file, octdec($conf->global->MAIN_UMASK)); |
|
| 256 | - } |
|
| 251 | + if (! $error && $pagecount) |
|
| 252 | + { |
|
| 253 | + $pdf->Output($file,'F'); |
|
| 254 | + if (! empty($conf->global->MAIN_UMASK)) |
|
| 255 | + @chmod($file, octdec($conf->global->MAIN_UMASK)); |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | - if ($usestdout) |
|
| 259 | - { |
|
| 260 | - if (! $error) print "Merged PDF has been built in ".$file."\n"; |
|
| 261 | - else print "Can't build PDF ".$file."\n"; |
|
| 262 | - } |
|
| 258 | + if ($usestdout) |
|
| 259 | + { |
|
| 260 | + if (! $error) print "Merged PDF has been built in ".$file."\n"; |
|
| 261 | + else print "Can't build PDF ".$file."\n"; |
|
| 262 | + } |
|
| 263 | 263 | |
| 264 | - $result = 1; |
|
| 265 | - } |
|
| 266 | - else |
|
| 267 | - { |
|
| 268 | - if ($usestdout) print "No invoices found for criteria.\n"; |
|
| 269 | - else dol_syslog("No invoices found for criteria"); |
|
| 270 | - $result = 0; |
|
| 271 | - } |
|
| 272 | - } |
|
| 273 | - else |
|
| 274 | - { |
|
| 275 | - dol_print_error($db); |
|
| 276 | - dol_syslog("scripts/invoices/rebuild_merge.php: Error"); |
|
| 277 | - $error++; |
|
| 278 | - } |
|
| 264 | + $result = 1; |
|
| 265 | + } |
|
| 266 | + else |
|
| 267 | + { |
|
| 268 | + if ($usestdout) print "No invoices found for criteria.\n"; |
|
| 269 | + else dol_syslog("No invoices found for criteria"); |
|
| 270 | + $result = 0; |
|
| 271 | + } |
|
| 272 | + } |
|
| 273 | + else |
|
| 274 | + { |
|
| 275 | + dol_print_error($db); |
|
| 276 | + dol_syslog("scripts/invoices/rebuild_merge.php: Error"); |
|
| 277 | + $error++; |
|
| 278 | + } |
|
| 279 | 279 | |
| 280 | - if ($error) return -1; |
|
| 281 | - else return $result; |
|
| 280 | + if ($error) return -1; |
|
| 281 | + else return $result; |
|
| 282 | 282 | } |
| 283 | 283 | |
@@ -48,86 +48,86 @@ discard block |
||
| 48 | 48 | * @param string $fileprefix Prefix to add into filename of generated PDF |
| 49 | 49 | * @return int Error code |
| 50 | 50 | */ |
| 51 | -function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf') |
|
| 51 | +function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = '', $fileprefix = 'mergedpdf') |
|
| 52 | 52 | { |
| 53 | 53 | $sql = "SELECT DISTINCT f.rowid, f.ref"; |
| 54 | - $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; |
|
| 55 | - $sqlwhere=''; |
|
| 56 | - $sqlorder=''; |
|
| 57 | - if (in_array('all',$filter)) |
|
| 54 | + $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; |
|
| 55 | + $sqlwhere = ''; |
|
| 56 | + $sqlorder = ''; |
|
| 57 | + if (in_array('all', $filter)) |
|
| 58 | 58 | { |
| 59 | 59 | $sqlorder = " ORDER BY f.ref ASC"; |
| 60 | 60 | } |
| 61 | - if (in_array('date',$filter)) |
|
| 61 | + if (in_array('date', $filter)) |
|
| 62 | 62 | { |
| 63 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 64 | - else $sqlwhere.=" AND"; |
|
| 65 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 66 | - $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'"; |
|
| 67 | - $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'"; |
|
| 63 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 64 | + else $sqlwhere .= " AND"; |
|
| 65 | + $sqlwhere .= " f.fk_statut > 0"; |
|
| 66 | + $sqlwhere .= " AND f.datef >= '".$db->idate($dateafterdate)."'"; |
|
| 67 | + $sqlwhere .= " AND f.datef <= '".$db->idate($datebeforedate)."'"; |
|
| 68 | 68 | $sqlorder = " ORDER BY f.datef ASC"; |
| 69 | 69 | } |
| 70 | - if (in_array('nopayment',$filter)) |
|
| 70 | + if (in_array('nopayment', $filter)) |
|
| 71 | 71 | { |
| 72 | - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; |
|
| 73 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 74 | - else $sqlwhere.=" AND"; |
|
| 75 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 76 | - $sqlwhere.= " AND pf.fk_paiement IS NULL"; |
|
| 72 | + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; |
|
| 73 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 74 | + else $sqlwhere .= " AND"; |
|
| 75 | + $sqlwhere .= " f.fk_statut > 0"; |
|
| 76 | + $sqlwhere .= " AND pf.fk_paiement IS NULL"; |
|
| 77 | 77 | } |
| 78 | - if (in_array('payments',$filter) || in_array('bank',$filter)) |
|
| 78 | + if (in_array('payments', $filter) || in_array('bank', $filter)) |
|
| 79 | 79 | { |
| 80 | - $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; |
|
| 81 | - if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 82 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 83 | - else $sqlwhere.=" AND"; |
|
| 84 | - $sqlwhere.= " f.fk_statut > 0"; |
|
| 85 | - $sqlwhere.= " AND f.rowid = pf.fk_facture"; |
|
| 86 | - $sqlwhere.= " AND pf.fk_paiement = p.rowid"; |
|
| 87 | - if (in_array('payments',$filter)) |
|
| 80 | + $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; |
|
| 81 | + if (in_array('bank', $filter)) $sql .= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 82 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 83 | + else $sqlwhere .= " AND"; |
|
| 84 | + $sqlwhere .= " f.fk_statut > 0"; |
|
| 85 | + $sqlwhere .= " AND f.rowid = pf.fk_facture"; |
|
| 86 | + $sqlwhere .= " AND pf.fk_paiement = p.rowid"; |
|
| 87 | + if (in_array('payments', $filter)) |
|
| 88 | 88 | { |
| 89 | - $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'"; |
|
| 90 | - $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'"; |
|
| 89 | + $sqlwhere .= " AND p.datep >= '".$db->idate($paymentdateafter)."'"; |
|
| 90 | + $sqlwhere .= " AND p.datep <= '".$db->idate($paymentdatebefore)."'"; |
|
| 91 | 91 | } |
| 92 | - if (in_array('bank',$filter)) |
|
| 92 | + if (in_array('bank', $filter)) |
|
| 93 | 93 | { |
| 94 | - $sqlwhere.= " AND p.fk_bank = b.rowid"; |
|
| 95 | - $sqlwhere.= " AND b.fk_account = ".$paymentbankid; |
|
| 94 | + $sqlwhere .= " AND p.fk_bank = b.rowid"; |
|
| 95 | + $sqlwhere .= " AND b.fk_account = ".$paymentbankid; |
|
| 96 | 96 | } |
| 97 | 97 | $sqlorder = " ORDER BY p.datep ASC"; |
| 98 | 98 | } |
| 99 | - if (in_array('nodeposit',$filter)) |
|
| 99 | + if (in_array('nodeposit', $filter)) |
|
| 100 | 100 | { |
| 101 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 102 | - else $sqlwhere.=" AND"; |
|
| 103 | - $sqlwhere.=' type <> 3'; |
|
| 101 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 102 | + else $sqlwhere .= " AND"; |
|
| 103 | + $sqlwhere .= ' type <> 3'; |
|
| 104 | 104 | } |
| 105 | - if (in_array('noreplacement',$filter)) |
|
| 105 | + if (in_array('noreplacement', $filter)) |
|
| 106 | 106 | { |
| 107 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 108 | - else $sqlwhere.=" AND"; |
|
| 109 | - $sqlwhere.=' type <> 1'; |
|
| 107 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 108 | + else $sqlwhere .= " AND"; |
|
| 109 | + $sqlwhere .= ' type <> 1'; |
|
| 110 | 110 | } |
| 111 | - if (in_array('nocreditnote',$filter)) |
|
| 111 | + if (in_array('nocreditnote', $filter)) |
|
| 112 | 112 | { |
| 113 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 114 | - else $sqlwhere.=" AND"; |
|
| 115 | - $sqlwhere.=' type <> 2'; |
|
| 113 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 114 | + else $sqlwhere .= " AND"; |
|
| 115 | + $sqlwhere .= ' type <> 2'; |
|
| 116 | 116 | } |
| 117 | - if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 117 | + if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid)) |
|
| 118 | 118 | { |
| 119 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 120 | - else $sqlwhere.=" AND"; |
|
| 121 | - $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')'; |
|
| 119 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 120 | + else $sqlwhere .= " AND"; |
|
| 121 | + $sqlwhere .= ' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')'; |
|
| 122 | 122 | } |
| 123 | - if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid)) |
|
| 123 | + if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid)) |
|
| 124 | 124 | { |
| 125 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 126 | - else $sqlwhere.=" AND"; |
|
| 127 | - $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')'; |
|
| 125 | + if (empty($sqlwhere)) $sqlwhere = ' WHERE '; |
|
| 126 | + else $sqlwhere .= " AND"; |
|
| 127 | + $sqlwhere .= ' f.fk_soc IN ('.join(',', $thirdpartiesid).')'; |
|
| 128 | 128 | } |
| 129 | - if ($sqlwhere) $sql.=$sqlwhere; |
|
| 130 | - if ($sqlorder) $sql.=$sqlorder; |
|
| 129 | + if ($sqlwhere) $sql .= $sqlwhere; |
|
| 130 | + if ($sqlorder) $sql .= $sqlorder; |
|
| 131 | 131 | |
| 132 | 132 | //print $sql; exit; |
| 133 | 133 | dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG); |
@@ -139,10 +139,10 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | $error = 0; |
| 141 | 141 | $result = 0; |
| 142 | - $files = array() ; // liste les fichiers |
|
| 142 | + $files = array(); // liste les fichiers |
|
| 143 | 143 | |
| 144 | 144 | dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG); |
| 145 | - if ( $resql=$db->query($sql) ) |
|
| 145 | + if ($resql = $db->query($sql)) |
|
| 146 | 146 | { |
| 147 | 147 | $num = $db->num_rows($resql); |
| 148 | 148 | $cpt = 0; |
@@ -160,23 +160,23 @@ discard block |
||
| 160 | 160 | $obj = $db->fetch_object($resql); |
| 161 | 161 | |
| 162 | 162 | $fac = new Facture($db); |
| 163 | - $result=$fac->fetch($obj->rowid); |
|
| 163 | + $result = $fac->fetch($obj->rowid); |
|
| 164 | 164 | if ($result > 0) |
| 165 | 165 | { |
| 166 | 166 | $outputlangs = $langs; |
| 167 | - if (! empty($newlangid)) |
|
| 167 | + if (!empty($newlangid)) |
|
| 168 | 168 | { |
| 169 | 169 | if ($outputlangs->defaultlang != $newlangid) |
| 170 | 170 | { |
| 171 | - $outputlangs = new Translate("",$conf); |
|
| 171 | + $outputlangs = new Translate("", $conf); |
|
| 172 | 172 | $outputlangs->setDefaultLang($newlangid); |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | - $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf'; |
|
| 176 | - if ($regenerate || ! dol_is_file($filename)) |
|
| 175 | + $filename = $conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf'; |
|
| 176 | + if ($regenerate || !dol_is_file($filename)) |
|
| 177 | 177 | { |
| 178 | 178 | if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n"; |
| 179 | - $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs); |
|
| 179 | + $result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs); |
|
| 180 | 180 | } |
| 181 | 181 | else { |
| 182 | 182 | if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n"; |
@@ -189,8 +189,8 @@ discard block |
||
| 189 | 189 | if ($result <= 0) |
| 190 | 190 | { |
| 191 | 191 | $error++; |
| 192 | - if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n"; |
|
| 193 | - else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR); |
|
| 192 | + if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n"; |
|
| 193 | + else dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | $cpt++; |
@@ -198,20 +198,20 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | |
| 200 | 200 | // Define format of output PDF |
| 201 | - $formatarray=pdf_getFormat($langs); |
|
| 201 | + $formatarray = pdf_getFormat($langs); |
|
| 202 | 202 | $page_largeur = $formatarray['width']; |
| 203 | 203 | $page_hauteur = $formatarray['height']; |
| 204 | - $format = array($page_largeur,$page_hauteur); |
|
| 204 | + $format = array($page_largeur, $page_hauteur); |
|
| 205 | 205 | |
| 206 | - if ($usestdout) print "Using output PDF format ".join('x',$format)."\n"; |
|
| 207 | - else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR); |
|
| 206 | + if ($usestdout) print "Using output PDF format ".join('x', $format)."\n"; |
|
| 207 | + else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR); |
|
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | // Now, build a merged files with all files in $files array |
| 211 | 211 | //--------------------------------------------------------- |
| 212 | 212 | |
| 213 | 213 | // Create empty PDF |
| 214 | - $pdf=pdf_getInstance($format); |
|
| 214 | + $pdf = pdf_getInstance($format); |
|
| 215 | 215 | if (class_exists('TCPDF')) |
| 216 | 216 | { |
| 217 | 217 | $pdf->setPrintHeader(false); |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | //$pdf->SetCompression(false); |
| 224 | 224 | |
| 225 | 225 | // Add all others |
| 226 | - foreach($files as $file) |
|
| 226 | + foreach ($files as $file) |
|
| 227 | 227 | { |
| 228 | 228 | if ($usestdout) print "Merge PDF file for invoice ".$file."\n"; |
| 229 | 229 | else dol_syslog("Merge PDF file for invoice ".$file); |
@@ -243,21 +243,21 @@ discard block |
||
| 243 | 243 | dol_mkdir($diroutputpdf); |
| 244 | 244 | |
| 245 | 245 | // Save merged file |
| 246 | - $filename=$fileprefix; |
|
| 247 | - if (empty($filename)) $filename='mergedpdf'; |
|
| 248 | - if (! empty($filesuffix)) $filename.='_'.$filesuffix; |
|
| 249 | - $file=$diroutputpdf.'/'.$filename.'.pdf'; |
|
| 246 | + $filename = $fileprefix; |
|
| 247 | + if (empty($filename)) $filename = 'mergedpdf'; |
|
| 248 | + if (!empty($filesuffix)) $filename .= '_'.$filesuffix; |
|
| 249 | + $file = $diroutputpdf.'/'.$filename.'.pdf'; |
|
| 250 | 250 | |
| 251 | - if (! $error && $pagecount) |
|
| 251 | + if (!$error && $pagecount) |
|
| 252 | 252 | { |
| 253 | - $pdf->Output($file,'F'); |
|
| 254 | - if (! empty($conf->global->MAIN_UMASK)) |
|
| 253 | + $pdf->Output($file, 'F'); |
|
| 254 | + if (!empty($conf->global->MAIN_UMASK)) |
|
| 255 | 255 | @chmod($file, octdec($conf->global->MAIN_UMASK)); |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | if ($usestdout) |
| 259 | 259 | { |
| 260 | - if (! $error) print "Merged PDF has been built in ".$file."\n"; |
|
| 260 | + if (!$error) print "Merged PDF has been built in ".$file."\n"; |
|
| 261 | 261 | else print "Can't build PDF ".$file."\n"; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -60,8 +60,11 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | if (in_array('date',$filter)) |
| 62 | 62 | { |
| 63 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 64 | - else $sqlwhere.=" AND"; |
|
| 63 | + if (empty($sqlwhere)) { |
|
| 64 | + $sqlwhere=' WHERE '; |
|
| 65 | + } else { |
|
| 66 | + $sqlwhere.=" AND"; |
|
| 67 | + } |
|
| 65 | 68 | $sqlwhere.= " f.fk_statut > 0"; |
| 66 | 69 | $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'"; |
| 67 | 70 | $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'"; |
@@ -70,17 +73,25 @@ discard block |
||
| 70 | 73 | if (in_array('nopayment',$filter)) |
| 71 | 74 | { |
| 72 | 75 | $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; |
| 73 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 74 | - else $sqlwhere.=" AND"; |
|
| 76 | + if (empty($sqlwhere)) { |
|
| 77 | + $sqlwhere=' WHERE '; |
|
| 78 | + } else { |
|
| 79 | + $sqlwhere.=" AND"; |
|
| 80 | + } |
|
| 75 | 81 | $sqlwhere.= " f.fk_statut > 0"; |
| 76 | 82 | $sqlwhere.= " AND pf.fk_paiement IS NULL"; |
| 77 | 83 | } |
| 78 | 84 | if (in_array('payments',$filter) || in_array('bank',$filter)) |
| 79 | 85 | { |
| 80 | 86 | $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; |
| 81 | - if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 82 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 83 | - else $sqlwhere.=" AND"; |
|
| 87 | + if (in_array('bank',$filter)) { |
|
| 88 | + $sql.= ", ".MAIN_DB_PREFIX."bank as b"; |
|
| 89 | + } |
|
| 90 | + if (empty($sqlwhere)) { |
|
| 91 | + $sqlwhere=' WHERE '; |
|
| 92 | + } else { |
|
| 93 | + $sqlwhere.=" AND"; |
|
| 94 | + } |
|
| 84 | 95 | $sqlwhere.= " f.fk_statut > 0"; |
| 85 | 96 | $sqlwhere.= " AND f.rowid = pf.fk_facture"; |
| 86 | 97 | $sqlwhere.= " AND pf.fk_paiement = p.rowid"; |
@@ -98,41 +109,62 @@ discard block |
||
| 98 | 109 | } |
| 99 | 110 | if (in_array('nodeposit',$filter)) |
| 100 | 111 | { |
| 101 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 102 | - else $sqlwhere.=" AND"; |
|
| 112 | + if (empty($sqlwhere)) { |
|
| 113 | + $sqlwhere=' WHERE '; |
|
| 114 | + } else { |
|
| 115 | + $sqlwhere.=" AND"; |
|
| 116 | + } |
|
| 103 | 117 | $sqlwhere.=' type <> 3'; |
| 104 | 118 | } |
| 105 | 119 | if (in_array('noreplacement',$filter)) |
| 106 | 120 | { |
| 107 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 108 | - else $sqlwhere.=" AND"; |
|
| 121 | + if (empty($sqlwhere)) { |
|
| 122 | + $sqlwhere=' WHERE '; |
|
| 123 | + } else { |
|
| 124 | + $sqlwhere.=" AND"; |
|
| 125 | + } |
|
| 109 | 126 | $sqlwhere.=' type <> 1'; |
| 110 | 127 | } |
| 111 | 128 | if (in_array('nocreditnote',$filter)) |
| 112 | 129 | { |
| 113 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 114 | - else $sqlwhere.=" AND"; |
|
| 130 | + if (empty($sqlwhere)) { |
|
| 131 | + $sqlwhere=' WHERE '; |
|
| 132 | + } else { |
|
| 133 | + $sqlwhere.=" AND"; |
|
| 134 | + } |
|
| 115 | 135 | $sqlwhere.=' type <> 2'; |
| 116 | 136 | } |
| 117 | 137 | if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid)) |
| 118 | 138 | { |
| 119 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 120 | - else $sqlwhere.=" AND"; |
|
| 139 | + if (empty($sqlwhere)) { |
|
| 140 | + $sqlwhere=' WHERE '; |
|
| 141 | + } else { |
|
| 142 | + $sqlwhere.=" AND"; |
|
| 143 | + } |
|
| 121 | 144 | $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')'; |
| 122 | 145 | } |
| 123 | 146 | if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid)) |
| 124 | 147 | { |
| 125 | - if (empty($sqlwhere)) $sqlwhere=' WHERE '; |
|
| 126 | - else $sqlwhere.=" AND"; |
|
| 148 | + if (empty($sqlwhere)) { |
|
| 149 | + $sqlwhere=' WHERE '; |
|
| 150 | + } else { |
|
| 151 | + $sqlwhere.=" AND"; |
|
| 152 | + } |
|
| 127 | 153 | $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')'; |
| 128 | 154 | } |
| 129 | - if ($sqlwhere) $sql.=$sqlwhere; |
|
| 130 | - if ($sqlorder) $sql.=$sqlorder; |
|
| 155 | + if ($sqlwhere) { |
|
| 156 | + $sql.=$sqlwhere; |
|
| 157 | + } |
|
| 158 | + if ($sqlorder) { |
|
| 159 | + $sql.=$sqlorder; |
|
| 160 | + } |
|
| 131 | 161 | |
| 132 | 162 | //print $sql; exit; |
| 133 | 163 | dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG); |
| 134 | 164 | |
| 135 | - if ($usestdout) print '--- start'."\n"; |
|
| 165 | + if ($usestdout) { |
|
| 166 | + print '--- start'."\n"; |
|
| 167 | + } |
|
| 136 | 168 | |
| 137 | 169 | // Start of transaction |
| 138 | 170 | //$db->begin(); |
@@ -175,11 +207,14 @@ discard block |
||
| 175 | 207 | $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf'; |
| 176 | 208 | if ($regenerate || ! dol_is_file($filename)) |
| 177 | 209 | { |
| 178 | - if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n"; |
|
| 210 | + if ($usestdout) { |
|
| 211 | + print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n"; |
|
| 212 | + } |
|
| 179 | 213 | $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs); |
| 180 | - } |
|
| 181 | - else { |
|
| 182 | - if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n"; |
|
| 214 | + } else { |
|
| 215 | + if ($usestdout) { |
|
| 216 | + print "PDF for invoice ".$obj->ref." already exists\n"; |
|
| 217 | + } |
|
| 183 | 218 | } |
| 184 | 219 | |
| 185 | 220 | // Add file into files array |
@@ -189,8 +224,11 @@ discard block |
||
| 189 | 224 | if ($result <= 0) |
| 190 | 225 | { |
| 191 | 226 | $error++; |
| 192 | - if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n"; |
|
| 193 | - else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR); |
|
| 227 | + if ($usestdout) { |
|
| 228 | + print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n"; |
|
| 229 | + } else { |
|
| 230 | + dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR); |
|
| 231 | + } |
|
| 194 | 232 | } |
| 195 | 233 | |
| 196 | 234 | $cpt++; |
@@ -203,8 +241,11 @@ discard block |
||
| 203 | 241 | $page_hauteur = $formatarray['height']; |
| 204 | 242 | $format = array($page_largeur,$page_hauteur); |
| 205 | 243 | |
| 206 | - if ($usestdout) print "Using output PDF format ".join('x',$format)."\n"; |
|
| 207 | - else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR); |
|
| 244 | + if ($usestdout) { |
|
| 245 | + print "Using output PDF format ".join('x',$format)."\n"; |
|
| 246 | + } else { |
|
| 247 | + dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR); |
|
| 248 | + } |
|
| 208 | 249 | |
| 209 | 250 | |
| 210 | 251 | // Now, build a merged files with all files in $files array |
@@ -219,14 +260,19 @@ discard block |
||
| 219 | 260 | } |
| 220 | 261 | $pdf->SetFont(pdf_getPDFFont($langs)); |
| 221 | 262 | |
| 222 | - if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false); |
|
| 263 | + if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) { |
|
| 264 | + $pdf->SetCompression(false); |
|
| 265 | + } |
|
| 223 | 266 | //$pdf->SetCompression(false); |
| 224 | 267 | |
| 225 | 268 | // Add all others |
| 226 | 269 | foreach($files as $file) |
| 227 | 270 | { |
| 228 | - if ($usestdout) print "Merge PDF file for invoice ".$file."\n"; |
|
| 229 | - else dol_syslog("Merge PDF file for invoice ".$file); |
|
| 271 | + if ($usestdout) { |
|
| 272 | + print "Merge PDF file for invoice ".$file."\n"; |
|
| 273 | + } else { |
|
| 274 | + dol_syslog("Merge PDF file for invoice ".$file); |
|
| 275 | + } |
|
| 230 | 276 | |
| 231 | 277 | // Charge un document PDF depuis un fichier. |
| 232 | 278 | $pagecount = $pdf->setSourceFile($file); |
@@ -244,40 +290,52 @@ discard block |
||
| 244 | 290 | |
| 245 | 291 | // Save merged file |
| 246 | 292 | $filename=$fileprefix; |
| 247 | - if (empty($filename)) $filename='mergedpdf'; |
|
| 248 | - if (! empty($filesuffix)) $filename.='_'.$filesuffix; |
|
| 293 | + if (empty($filename)) { |
|
| 294 | + $filename='mergedpdf'; |
|
| 295 | + } |
|
| 296 | + if (! empty($filesuffix)) { |
|
| 297 | + $filename.='_'.$filesuffix; |
|
| 298 | + } |
|
| 249 | 299 | $file=$diroutputpdf.'/'.$filename.'.pdf'; |
| 250 | 300 | |
| 251 | 301 | if (! $error && $pagecount) |
| 252 | 302 | { |
| 253 | 303 | $pdf->Output($file,'F'); |
| 254 | - if (! empty($conf->global->MAIN_UMASK)) |
|
| 255 | - @chmod($file, octdec($conf->global->MAIN_UMASK)); |
|
| 304 | + if (! empty($conf->global->MAIN_UMASK)) { |
|
| 305 | + @chmod($file, octdec($conf->global->MAIN_UMASK)); |
|
| 306 | + } |
|
| 256 | 307 | } |
| 257 | 308 | |
| 258 | 309 | if ($usestdout) |
| 259 | 310 | { |
| 260 | - if (! $error) print "Merged PDF has been built in ".$file."\n"; |
|
| 261 | - else print "Can't build PDF ".$file."\n"; |
|
| 311 | + if (! $error) { |
|
| 312 | + print "Merged PDF has been built in ".$file."\n"; |
|
| 313 | + } else { |
|
| 314 | + print "Can't build PDF ".$file."\n"; |
|
| 315 | + } |
|
| 262 | 316 | } |
| 263 | 317 | |
| 264 | 318 | $result = 1; |
| 265 | - } |
|
| 266 | - else |
|
| 319 | + } else |
|
| 267 | 320 | { |
| 268 | - if ($usestdout) print "No invoices found for criteria.\n"; |
|
| 269 | - else dol_syslog("No invoices found for criteria"); |
|
| 321 | + if ($usestdout) { |
|
| 322 | + print "No invoices found for criteria.\n"; |
|
| 323 | + } else { |
|
| 324 | + dol_syslog("No invoices found for criteria"); |
|
| 325 | + } |
|
| 270 | 326 | $result = 0; |
| 271 | 327 | } |
| 272 | - } |
|
| 273 | - else |
|
| 328 | + } else |
|
| 274 | 329 | { |
| 275 | 330 | dol_print_error($db); |
| 276 | 331 | dol_syslog("scripts/invoices/rebuild_merge.php: Error"); |
| 277 | 332 | $error++; |
| 278 | 333 | } |
| 279 | 334 | |
| 280 | - if ($error) return -1; |
|
| 281 | - else return $result; |
|
| 282 | -} |
|
| 335 | + if ($error) { |
|
| 336 | + return -1; |
|
| 337 | + } else { |
|
| 338 | + return $result; |
|
| 339 | + } |
|
| 340 | + } |
|
| 283 | 341 | |
@@ -33,31 +33,31 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function prelevement_prepare_head(BonPrelevement $object) |
| 35 | 35 | { |
| 36 | - global $langs, $conf, $user; |
|
| 37 | - $langs->load("withdrawals"); |
|
| 36 | + global $langs, $conf, $user; |
|
| 37 | + $langs->load("withdrawals"); |
|
| 38 | 38 | |
| 39 | - $h = 0; |
|
| 40 | - $head = array(); |
|
| 39 | + $h = 0; |
|
| 40 | + $head = array(); |
|
| 41 | 41 | |
| 42 | - $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id; |
|
| 43 | - $head[$h][1] = $langs->trans("Card"); |
|
| 44 | - $head[$h][2] = 'prelevement'; |
|
| 45 | - $h++; |
|
| 42 | + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id; |
|
| 43 | + $head[$h][1] = $langs->trans("Card"); |
|
| 44 | + $head[$h][2] = 'prelevement'; |
|
| 45 | + $h++; |
|
| 46 | 46 | |
| 47 | - $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id; |
|
| 48 | - $head[$h][1] = $langs->trans("Bills"); |
|
| 49 | - $head[$h][2] = 'invoices'; |
|
| 50 | - $h++; |
|
| 47 | + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id; |
|
| 48 | + $head[$h][1] = $langs->trans("Bills"); |
|
| 49 | + $head[$h][2] = 'invoices'; |
|
| 50 | + $h++; |
|
| 51 | 51 | |
| 52 | - $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id; |
|
| 53 | - $head[$h][1] = $langs->trans("Rejects"); |
|
| 54 | - $head[$h][2] = 'rejects'; |
|
| 55 | - $h++; |
|
| 52 | + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id; |
|
| 53 | + $head[$h][1] = $langs->trans("Rejects"); |
|
| 54 | + $head[$h][2] = 'rejects'; |
|
| 55 | + $h++; |
|
| 56 | 56 | |
| 57 | - $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id; |
|
| 58 | - $head[$h][1] = $langs->trans("Statistics"); |
|
| 59 | - $head[$h][2] = 'statistics'; |
|
| 60 | - $h++; |
|
| 57 | + $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id; |
|
| 58 | + $head[$h][1] = $langs->trans("Statistics"); |
|
| 59 | + $head[$h][2] = 'statistics'; |
|
| 60 | + $h++; |
|
| 61 | 61 | |
| 62 | 62 | // Show more tabs from modules |
| 63 | 63 | // Entries must be declared in modules descriptor with line |
@@ -77,10 +77,10 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | function prelevement_check_config() |
| 79 | 79 | { |
| 80 | - global $conf; |
|
| 81 | - if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1; |
|
| 82 | - if(empty($conf->global->PRELEVEMENT_ICS)) return -1; |
|
| 80 | + global $conf; |
|
| 81 | + if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1; |
|
| 82 | + if(empty($conf->global->PRELEVEMENT_ICS)) return -1; |
|
| 83 | 83 | if(empty($conf->global->PRELEVEMENT_USER)) return -1; |
| 84 | - return 0; |
|
| 84 | + return 0; |
|
| 85 | 85 | } |
| 86 | 86 | |
@@ -63,9 +63,9 @@ discard block |
||
| 63 | 63 | // Entries must be declared in modules descriptor with line |
| 64 | 64 | // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
| 65 | 65 | // $this->tabs = array('entity:-tabname); to remove a tab |
| 66 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement'); |
|
| 66 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement'); |
|
| 67 | 67 | |
| 68 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement','remove'); |
|
| 68 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove'); |
|
| 69 | 69 | |
| 70 | 70 | return $head; |
| 71 | 71 | } |
@@ -78,9 +78,9 @@ discard block |
||
| 78 | 78 | function prelevement_check_config() |
| 79 | 79 | { |
| 80 | 80 | global $conf; |
| 81 | - if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1; |
|
| 82 | - if(empty($conf->global->PRELEVEMENT_ICS)) return -1; |
|
| 83 | - if(empty($conf->global->PRELEVEMENT_USER)) return -1; |
|
| 81 | + if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1; |
|
| 82 | + if (empty($conf->global->PRELEVEMENT_ICS)) return -1; |
|
| 83 | + if (empty($conf->global->PRELEVEMENT_USER)) return -1; |
|
| 84 | 84 | return 0; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -78,9 +78,15 @@ |
||
| 78 | 78 | function prelevement_check_config() |
| 79 | 79 | { |
| 80 | 80 | global $conf; |
| 81 | - if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1; |
|
| 82 | - if(empty($conf->global->PRELEVEMENT_ICS)) return -1; |
|
| 83 | - if(empty($conf->global->PRELEVEMENT_USER)) return -1; |
|
| 81 | + if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) { |
|
| 82 | + return -1; |
|
| 83 | + } |
|
| 84 | + if(empty($conf->global->PRELEVEMENT_ICS)) { |
|
| 85 | + return -1; |
|
| 86 | + } |
|
| 87 | + if(empty($conf->global->PRELEVEMENT_USER)) { |
|
| 88 | + return -1; |
|
| 89 | + } |
|
| 84 | 90 | return 0; |
| 85 | 91 | } |
| 86 | 92 | |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | return array( |
| 227 | 227 | "error" => '', |
| 228 | 228 | "encoding" => $encoding, |
| 229 | - "bars" => $line, |
|
| 230 | - "text" => $text |
|
| 229 | + "bars" => $line, |
|
| 230 | + "text" => $text |
|
| 231 | 231 | ); |
| 232 | 232 | } |
| 233 | 233 | |
@@ -271,16 +271,16 @@ discard block |
||
| 271 | 271 | } |
| 272 | 272 | //var_dump($bars); |
| 273 | 273 | $ret=array( |
| 274 | - "bars" => trim($bars), |
|
| 275 | - "text" => trim($text), |
|
| 276 | - "encoding" => trim($encoding), |
|
| 277 | - "error" => "" |
|
| 274 | + "bars" => trim($bars), |
|
| 275 | + "text" => trim($text), |
|
| 276 | + "encoding" => trim($encoding), |
|
| 277 | + "error" => "" |
|
| 278 | 278 | ); |
| 279 | 279 | //var_dump($ret); |
| 280 | 280 | if (preg_match('/permission denied/i',$ret['bars'])) |
| 281 | 281 | { |
| 282 | - $ret['error']=$ret['bars']; $ret['bars']=''; |
|
| 283 | - return $ret; |
|
| 282 | + $ret['error']=$ret['bars']; $ret['bars']=''; |
|
| 283 | + return $ret; |
|
| 284 | 284 | } |
| 285 | 285 | if (!$ret['bars']) return false; |
| 286 | 286 | if (!$ret['text']) return false; |
@@ -27,18 +27,18 @@ discard block |
||
| 27 | 27 | /* ******************************************************************** */ |
| 28 | 28 | /* COLORS */ |
| 29 | 29 | /* ******************************************************************** */ |
| 30 | -$bar_color=array(0,0,0); |
|
| 31 | -$bg_color=array(255,255,255); |
|
| 32 | -$text_color=array(0,0,0); |
|
| 30 | +$bar_color = array(0, 0, 0); |
|
| 31 | +$bg_color = array(255, 255, 255); |
|
| 32 | +$text_color = array(0, 0, 0); |
|
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | /* ******************************************************************** */ |
| 36 | 36 | /* FONT FILE */ |
| 37 | 37 | /* ******************************************************************** */ |
| 38 | -if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD'); |
|
| 38 | +if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc = constant('DOL_DEFAULT_TTF_BOLD'); |
|
| 39 | 39 | // Automatic-Detection of Font if running Windows |
| 40 | 40 | // @CHANGE LDR |
| 41 | -if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf'; |
|
| 41 | +if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf'; |
|
| 42 | 42 | if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.'); |
| 43 | 43 | |
| 44 | 44 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN |
| 51 | 51 | */ |
| 52 | 52 | |
| 53 | -if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND'); |
|
| 53 | +if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND'); |
|
| 54 | 54 | else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; |
| 55 | 55 | |
| 56 | 56 | |
@@ -65,20 +65,20 @@ discard block |
||
| 65 | 65 | * @param string $mode 'png' or 'jpg' ... |
| 66 | 66 | * @return array|string $bars array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) or string with error message |
| 67 | 67 | */ |
| 68 | -function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png") |
|
| 68 | +function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png") |
|
| 69 | 69 | { |
| 70 | 70 | dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode"); |
| 71 | 71 | |
| 72 | - $bars=barcode_encode($code,$encoding); |
|
| 73 | - if (! $bars || ! empty($bars['error'])) |
|
| 72 | + $bars = barcode_encode($code, $encoding); |
|
| 73 | + if (!$bars || !empty($bars['error'])) |
|
| 74 | 74 | { |
| 75 | 75 | // Return error message instead of array |
| 76 | - if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding; |
|
| 77 | - else $error=$bars['error']; |
|
| 76 | + if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding; |
|
| 77 | + else $error = $bars['error']; |
|
| 78 | 78 | dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR); |
| 79 | 79 | return $error; |
| 80 | 80 | } |
| 81 | - if (! $mode) $mode="png"; |
|
| 81 | + if (!$mode) $mode = "png"; |
|
| 82 | 82 | //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']); |
| 83 | 83 | //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0); |
| 84 | 84 | //else |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param string $encoding Encoding |
| 109 | 109 | * @return array array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) |
| 110 | 110 | */ |
| 111 | -function barcode_encode($code,$encoding) |
|
| 111 | +function barcode_encode($code, $encoding) |
|
| 112 | 112 | { |
| 113 | 113 | global $genbarcode_loc; |
| 114 | 114 | |
@@ -116,23 +116,23 @@ discard block |
||
| 116 | 116 | (preg_match("/^ean$/i", $encoding)) |
| 117 | 117 | |
| 118 | 118 | || (($encoding) && (preg_match("/^isbn$/i", $encoding)) |
| 119 | - && (( strlen($code)==9 || strlen($code)==10) || |
|
| 120 | - (((preg_match("/^978/", $code) && strlen($code)==12) || |
|
| 121 | - (strlen($code)==13))))) |
|
| 119 | + && ((strlen($code) == 9 || strlen($code) == 10) || |
|
| 120 | + (((preg_match("/^978/", $code) && strlen($code) == 12) || |
|
| 121 | + (strlen($code) == 13))))) |
|
| 122 | 122 | |
| 123 | - || (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) )) |
|
| 123 | + || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding))) |
|
| 124 | 124 | && (preg_match("/^[0-9]{12,13}$/", $code))) |
| 125 | 125 | ) |
| 126 | 126 | { |
| 127 | 127 | /* use built-in EAN-Encoder */ |
| 128 | 128 | dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean"); |
| 129 | - $bars=barcode_encode_ean($code, $encoding); |
|
| 129 | + $bars = barcode_encode_ean($code, $encoding); |
|
| 130 | 130 | } |
| 131 | 131 | else if (file_exists($genbarcode_loc)) // For example C39 |
| 132 | 132 | { |
| 133 | 133 | /* use genbarcode */ |
| 134 | 134 | dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding); |
| 135 | - $bars=barcode_encode_genbarcode($code, $encoding); |
|
| 135 | + $bars = barcode_encode_genbarcode($code, $encoding); |
|
| 136 | 136 | } |
| 137 | 137 | else |
| 138 | 138 | { |
@@ -160,14 +160,14 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | function barcode_gen_ean_sum($ean) |
| 162 | 162 | { |
| 163 | - $even=true; $esum=0; $osum=0; |
|
| 164 | - $ln=strlen($ean)-1; |
|
| 165 | - for ($i=$ln; $i>=0; $i--) |
|
| 163 | + $even = true; $esum = 0; $osum = 0; |
|
| 164 | + $ln = strlen($ean) - 1; |
|
| 165 | + for ($i = $ln; $i >= 0; $i--) |
|
| 166 | 166 | { |
| 167 | - if ($even) $esum+=$ean[$i]; else $osum+=$ean[$i]; |
|
| 168 | - $even=!$even; |
|
| 167 | + if ($even) $esum += $ean[$i]; else $osum += $ean[$i]; |
|
| 168 | + $even = !$even; |
|
| 169 | 169 | } |
| 170 | - return (10-((3*$esum+$osum)%10))%10; |
|
| 170 | + return (10 - ((3 * $esum + $osum) % 10)) % 10; |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -179,48 +179,48 @@ discard block |
||
| 179 | 179 | */ |
| 180 | 180 | function barcode_encode_ean($ean, $encoding = "EAN-13") |
| 181 | 181 | { |
| 182 | - $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112); |
|
| 183 | - $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010"); |
|
| 184 | - $guards=array("9a1a","1a1a1","a1a"); |
|
| 182 | + $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112); |
|
| 183 | + $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010"); |
|
| 184 | + $guards = array("9a1a", "1a1a1", "a1a"); |
|
| 185 | 185 | |
| 186 | - $ean=trim($ean); |
|
| 187 | - if (preg_match("/[^0-9]/i",$ean)) |
|
| 186 | + $ean = trim($ean); |
|
| 187 | + if (preg_match("/[^0-9]/i", $ean)) |
|
| 188 | 188 | { |
| 189 | 189 | return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)"); |
| 190 | 190 | } |
| 191 | - $encoding=strtoupper($encoding); |
|
| 192 | - if ($encoding=="ISBN") |
|
| 191 | + $encoding = strtoupper($encoding); |
|
| 192 | + if ($encoding == "ISBN") |
|
| 193 | 193 | { |
| 194 | - if (!preg_match("/^978/", $ean)) $ean="978".$ean; |
|
| 194 | + if (!preg_match("/^978/", $ean)) $ean = "978".$ean; |
|
| 195 | 195 | } |
| 196 | - if (preg_match("/^978/", $ean)) $encoding="ISBN"; |
|
| 197 | - if (strlen($ean)<12 || strlen($ean)>13) |
|
| 196 | + if (preg_match("/^978/", $ean)) $encoding = "ISBN"; |
|
| 197 | + if (strlen($ean) < 12 || strlen($ean) > 13) |
|
| 198 | 198 | { |
| 199 | 199 | return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)"); |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $ean=substr($ean,0,12); |
|
| 203 | - $eansum=barcode_gen_ean_sum($ean); |
|
| 204 | - $ean.=$eansum; |
|
| 205 | - $line=$guards[0]; |
|
| 206 | - for ($i=1;$i<13;$i++) |
|
| 202 | + $ean = substr($ean, 0, 12); |
|
| 203 | + $eansum = barcode_gen_ean_sum($ean); |
|
| 204 | + $ean .= $eansum; |
|
| 205 | + $line = $guards[0]; |
|
| 206 | + for ($i = 1; $i < 13; $i++) |
|
| 207 | 207 | { |
| 208 | - $str=$digits[$ean[$i]]; |
|
| 209 | - if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str; |
|
| 210 | - if ($i==6) $line.=$guards[1]; |
|
| 208 | + $str = $digits[$ean[$i]]; |
|
| 209 | + if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str; |
|
| 210 | + if ($i == 6) $line .= $guards[1]; |
|
| 211 | 211 | } |
| 212 | - $line.=$guards[2]; |
|
| 212 | + $line .= $guards[2]; |
|
| 213 | 213 | |
| 214 | 214 | /* create text */ |
| 215 | - $pos=0; |
|
| 216 | - $text=""; |
|
| 217 | - for ($a=0;$a<13;$a++) |
|
| 215 | + $pos = 0; |
|
| 216 | + $text = ""; |
|
| 217 | + for ($a = 0; $a < 13; $a++) |
|
| 218 | 218 | { |
| 219 | - if ($a>0) $text.=" "; |
|
| 220 | - $text.="$pos:12:{$ean[$a]}"; |
|
| 221 | - if ($a==0) $pos+=12; |
|
| 222 | - else if ($a==6) $pos+=12; |
|
| 223 | - else $pos+=7; |
|
| 219 | + if ($a > 0) $text .= " "; |
|
| 220 | + $text .= "$pos:12:{$ean[$a]}"; |
|
| 221 | + if ($a == 0) $pos += 12; |
|
| 222 | + else if ($a == 6) $pos += 12; |
|
| 223 | + else $pos += 7; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | return array( |
@@ -238,30 +238,30 @@ discard block |
||
| 238 | 238 | * @param string $encoding Encoding |
| 239 | 239 | * @return array array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) |
| 240 | 240 | */ |
| 241 | -function barcode_encode_genbarcode($code,$encoding) |
|
| 241 | +function barcode_encode_genbarcode($code, $encoding) |
|
| 242 | 242 | { |
| 243 | 243 | global $genbarcode_loc; |
| 244 | 244 | |
| 245 | 245 | // Clean parameters |
| 246 | - if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12); |
|
| 247 | - if (!$encoding) $encoding="ANY"; |
|
| 248 | - $encoding=preg_replace("/[\\\|]/", "_", $encoding); |
|
| 249 | - $code=preg_replace("/[\\\|]/", "_", $code); |
|
| 246 | + if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12); |
|
| 247 | + if (!$encoding) $encoding = "ANY"; |
|
| 248 | + $encoding = preg_replace("/[\\\|]/", "_", $encoding); |
|
| 249 | + $code = preg_replace("/[\\\|]/", "_", $code); |
|
| 250 | 250 | |
| 251 | - $command=escapeshellarg($genbarcode_loc); |
|
| 251 | + $command = escapeshellarg($genbarcode_loc); |
|
| 252 | 252 | //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\""; |
| 253 | - $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding)); |
|
| 253 | + $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding)); |
|
| 254 | 254 | |
| 255 | - $fullcommandclear=$command." ".$paramclear." 2>&1"; |
|
| 255 | + $fullcommandclear = $command." ".$paramclear." 2>&1"; |
|
| 256 | 256 | //print $fullcommandclear."<br>\n";exit; |
| 257 | 257 | |
| 258 | 258 | dol_syslog("Run command ".$fullcommandclear); |
| 259 | - $fp=popen($fullcommandclear, "r"); |
|
| 259 | + $fp = popen($fullcommandclear, "r"); |
|
| 260 | 260 | if ($fp) |
| 261 | 261 | { |
| 262 | - $bars=fgets($fp, 1024); |
|
| 263 | - $text=fgets($fp, 1024); |
|
| 264 | - $encoding=fgets($fp, 1024); |
|
| 262 | + $bars = fgets($fp, 1024); |
|
| 263 | + $text = fgets($fp, 1024); |
|
| 264 | + $encoding = fgets($fp, 1024); |
|
| 265 | 265 | pclose($fp); |
| 266 | 266 | } |
| 267 | 267 | else |
@@ -270,16 +270,16 @@ discard block |
||
| 270 | 270 | return false; |
| 271 | 271 | } |
| 272 | 272 | //var_dump($bars); |
| 273 | - $ret=array( |
|
| 273 | + $ret = array( |
|
| 274 | 274 | "bars" => trim($bars), |
| 275 | 275 | "text" => trim($text), |
| 276 | 276 | "encoding" => trim($encoding), |
| 277 | 277 | "error" => "" |
| 278 | 278 | ); |
| 279 | 279 | //var_dump($ret); |
| 280 | - if (preg_match('/permission denied/i',$ret['bars'])) |
|
| 280 | + if (preg_match('/permission denied/i', $ret['bars'])) |
|
| 281 | 281 | { |
| 282 | - $ret['error']=$ret['bars']; $ret['bars']=''; |
|
| 282 | + $ret['error'] = $ret['bars']; $ret['bars'] = ''; |
|
| 283 | 283 | return $ret; |
| 284 | 284 | } |
| 285 | 285 | if (!$ret['bars']) return false; |
@@ -310,101 +310,101 @@ discard block |
||
| 310 | 310 | //var_dump($font_loc); |
| 311 | 311 | |
| 312 | 312 | /* set defaults */ |
| 313 | - if ($scale<1) $scale=2; |
|
| 314 | - $total_y=(int) $total_y; |
|
| 315 | - if ($total_y<1) $total_y=(int) $scale * 60; |
|
| 313 | + if ($scale < 1) $scale = 2; |
|
| 314 | + $total_y = (int) $total_y; |
|
| 315 | + if ($total_y < 1) $total_y = (int) $scale * 60; |
|
| 316 | 316 | if (!$space) |
| 317 | - $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale); |
|
| 317 | + $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale); |
|
| 318 | 318 | |
| 319 | 319 | /* count total width */ |
| 320 | - $xpos=0; |
|
| 321 | - $width=true; |
|
| 322 | - $ln=strlen($bars); |
|
| 323 | - for ($i=0; $i<$ln; $i++) |
|
| 320 | + $xpos = 0; |
|
| 321 | + $width = true; |
|
| 322 | + $ln = strlen($bars); |
|
| 323 | + for ($i = 0; $i < $ln; $i++) |
|
| 324 | 324 | { |
| 325 | - $val=strtolower($bars[$i]); |
|
| 325 | + $val = strtolower($bars[$i]); |
|
| 326 | 326 | if ($width) |
| 327 | 327 | { |
| 328 | - $xpos+=$val*$scale; |
|
| 329 | - $width=false; |
|
| 328 | + $xpos += $val * $scale; |
|
| 329 | + $width = false; |
|
| 330 | 330 | continue; |
| 331 | 331 | } |
| 332 | 332 | if (preg_match("/[a-z]/", $val)) |
| 333 | 333 | { |
| 334 | 334 | /* tall bar */ |
| 335 | - $val=ord($val)-ord('a')+1; |
|
| 335 | + $val = ord($val) - ord('a') + 1; |
|
| 336 | 336 | } |
| 337 | - $xpos+=$val*$scale; |
|
| 338 | - $width=true; |
|
| 337 | + $xpos += $val * $scale; |
|
| 338 | + $width = true; |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | /* allocate the image */ |
| 342 | - $total_x=( $xpos )+$space['right']+$space['right']; |
|
| 343 | - $xpos=$space['left']; |
|
| 344 | - if (! function_exists("imagecreate")) |
|
| 342 | + $total_x = ($xpos) + $space['right'] + $space['right']; |
|
| 343 | + $xpos = $space['left']; |
|
| 344 | + if (!function_exists("imagecreate")) |
|
| 345 | 345 | { |
| 346 | 346 | print "You don't have the gd2 extension enabled<br>\n"; |
| 347 | 347 | return ""; |
| 348 | 348 | } |
| 349 | - $im=imagecreate($total_x, $total_y); |
|
| 349 | + $im = imagecreate($total_x, $total_y); |
|
| 350 | 350 | /* create two images */ |
| 351 | - $col_bg=ImageColorAllocate($im,$bg_color[0],$bg_color[1],$bg_color[2]); |
|
| 352 | - $col_bar=ImageColorAllocate($im,$bar_color[0],$bar_color[1],$bar_color[2]); |
|
| 353 | - $col_text=ImageColorAllocate($im,$text_color[0],$text_color[1],$text_color[2]); |
|
| 354 | - $height=round($total_y-($scale*10)); |
|
| 355 | - $height2=round($total_y-$space['bottom']); |
|
| 351 | + $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]); |
|
| 352 | + $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]); |
|
| 353 | + $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]); |
|
| 354 | + $height = round($total_y - ($scale * 10)); |
|
| 355 | + $height2 = round($total_y - $space['bottom']); |
|
| 356 | 356 | |
| 357 | 357 | /* paint the bars */ |
| 358 | - $width=true; |
|
| 359 | - $ln=strlen($bars); |
|
| 360 | - for ($i=0; $i<$ln; $i++) |
|
| 358 | + $width = true; |
|
| 359 | + $ln = strlen($bars); |
|
| 360 | + for ($i = 0; $i < $ln; $i++) |
|
| 361 | 361 | { |
| 362 | - $val=strtolower($bars[$i]); |
|
| 362 | + $val = strtolower($bars[$i]); |
|
| 363 | 363 | if ($width) |
| 364 | 364 | { |
| 365 | - $xpos+=$val*$scale; |
|
| 366 | - $width=false; |
|
| 365 | + $xpos += $val * $scale; |
|
| 366 | + $width = false; |
|
| 367 | 367 | continue; |
| 368 | 368 | } |
| 369 | 369 | if (preg_match("/[a-z]/", $val)) |
| 370 | 370 | { |
| 371 | 371 | /* tall bar */ |
| 372 | - $val=ord($val)-ord('a')+1; |
|
| 373 | - $h=$height2; |
|
| 374 | - } else $h=$height; |
|
| 375 | - imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar); |
|
| 376 | - $xpos+=$val*$scale; |
|
| 377 | - $width=true; |
|
| 372 | + $val = ord($val) - ord('a') + 1; |
|
| 373 | + $h = $height2; |
|
| 374 | + } else $h = $height; |
|
| 375 | + imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar); |
|
| 376 | + $xpos += $val * $scale; |
|
| 377 | + $width = true; |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | - $chars=explode(" ", $text); |
|
| 380 | + $chars = explode(" ", $text); |
|
| 381 | 381 | reset($chars); |
| 382 | - while (list($n, $v)=each($chars)) |
|
| 382 | + while (list($n, $v) = each($chars)) |
|
| 383 | 383 | { |
| 384 | 384 | if (trim($v)) |
| 385 | 385 | { |
| 386 | - $inf=explode(":", $v); |
|
| 387 | - $fontsize=$scale*($inf[1]/1.8); |
|
| 388 | - $fontheight=$total_y-($fontsize/2.7)+2; |
|
| 389 | - imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2, $fontheight, $col_text, $font_loc, $inf[2]); |
|
| 386 | + $inf = explode(":", $v); |
|
| 387 | + $fontsize = $scale * ($inf[1] / 1.8); |
|
| 388 | + $fontheight = $total_y - ($fontsize / 2.7) + 2; |
|
| 389 | + imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]); |
|
| 390 | 390 | } |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | /* output the image */ |
| 394 | - $mode=strtolower($mode); |
|
| 395 | - if ($mode=='jpg' || $mode=='jpeg') |
|
| 394 | + $mode = strtolower($mode); |
|
| 395 | + if ($mode == 'jpg' || $mode == 'jpeg') |
|
| 396 | 396 | { |
| 397 | 397 | header("Content-Type: image/jpeg; name=\"barcode.jpg\""); |
| 398 | 398 | imagejpeg($im); |
| 399 | 399 | } |
| 400 | - else if ($mode=='gif') |
|
| 400 | + else if ($mode == 'gif') |
|
| 401 | 401 | { |
| 402 | 402 | header("Content-Type: image/gif; name=\"barcode.gif\""); |
| 403 | 403 | imagegif($im); |
| 404 | 404 | } |
| 405 | - else if (! empty($filebarcode)) // To wxrite into afile onto disk |
|
| 405 | + else if (!empty($filebarcode)) // To wxrite into afile onto disk |
|
| 406 | 406 | { |
| 407 | - imagepng($im,$filebarcode); |
|
| 407 | + imagepng($im, $filebarcode); |
|
| 408 | 408 | } |
| 409 | 409 | else |
| 410 | 410 | { |
@@ -35,11 +35,17 @@ discard block |
||
| 35 | 35 | /* ******************************************************************** */ |
| 36 | 36 | /* FONT FILE */ |
| 37 | 37 | /* ******************************************************************** */ |
| 38 | -if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD'); |
|
| 38 | +if (defined('DOL_DEFAULT_TTF_BOLD')) { |
|
| 39 | + $font_loc=constant('DOL_DEFAULT_TTF_BOLD'); |
|
| 40 | +} |
|
| 39 | 41 | // Automatic-Detection of Font if running Windows |
| 40 | 42 | // @CHANGE LDR |
| 41 | -if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf'; |
|
| 42 | -if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.'); |
|
| 43 | +if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) { |
|
| 44 | + $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf'; |
|
| 45 | +} |
|
| 46 | +if (empty($font_loc)) { |
|
| 47 | + die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.'); |
|
| 48 | +} |
|
| 43 | 49 | |
| 44 | 50 | |
| 45 | 51 | /* ******************************************************************** */ |
@@ -50,8 +56,11 @@ discard block |
||
| 50 | 56 | * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN |
| 51 | 57 | */ |
| 52 | 58 | |
| 53 | -if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND'); |
|
| 54 | -else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; |
|
| 59 | +if (defined('PHP-BARCODE_PATH_COMMAND')) { |
|
| 60 | + $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND'); |
|
| 61 | +} else { |
|
| 62 | + $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; |
|
| 63 | +} |
|
| 55 | 64 | |
| 56 | 65 | |
| 57 | 66 | |
@@ -73,12 +82,17 @@ discard block |
||
| 73 | 82 | if (! $bars || ! empty($bars['error'])) |
| 74 | 83 | { |
| 75 | 84 | // Return error message instead of array |
| 76 | - if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding; |
|
| 77 | - else $error=$bars['error']; |
|
| 85 | + if (empty($bars['error'])) { |
|
| 86 | + $error='Bad Value '.$code.' for encoding '.$encoding; |
|
| 87 | + } else { |
|
| 88 | + $error=$bars['error']; |
|
| 89 | + } |
|
| 78 | 90 | dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR); |
| 79 | 91 | return $error; |
| 80 | 92 | } |
| 81 | - if (! $mode) $mode="png"; |
|
| 93 | + if (! $mode) { |
|
| 94 | + $mode="png"; |
|
| 95 | + } |
|
| 82 | 96 | //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']); |
| 83 | 97 | //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0); |
| 84 | 98 | //else |
@@ -127,14 +141,14 @@ discard block |
||
| 127 | 141 | /* use built-in EAN-Encoder */ |
| 128 | 142 | dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean"); |
| 129 | 143 | $bars=barcode_encode_ean($code, $encoding); |
| 130 | - } |
|
| 131 | - else if (file_exists($genbarcode_loc)) // For example C39 |
|
| 144 | + } else if (file_exists($genbarcode_loc)) { |
|
| 145 | + // For example C39 |
|
| 132 | 146 | { |
| 133 | 147 | /* use genbarcode */ |
| 134 | 148 | dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding); |
| 135 | - $bars=barcode_encode_genbarcode($code, $encoding); |
|
| 136 | 149 | } |
| 137 | - else |
|
| 150 | + $bars=barcode_encode_genbarcode($code, $encoding); |
|
| 151 | + } else |
|
| 138 | 152 | { |
| 139 | 153 | print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n"; |
| 140 | 154 | print "<UL>\n"; |
@@ -164,7 +178,11 @@ discard block |
||
| 164 | 178 | $ln=strlen($ean)-1; |
| 165 | 179 | for ($i=$ln; $i>=0; $i--) |
| 166 | 180 | { |
| 167 | - if ($even) $esum+=$ean[$i]; else $osum+=$ean[$i]; |
|
| 181 | + if ($even) { |
|
| 182 | + $esum+=$ean[$i]; |
|
| 183 | + } else { |
|
| 184 | + $osum+=$ean[$i]; |
|
| 185 | + } |
|
| 168 | 186 | $even=!$even; |
| 169 | 187 | } |
| 170 | 188 | return (10-((3*$esum+$osum)%10))%10; |
@@ -191,9 +209,13 @@ discard block |
||
| 191 | 209 | $encoding=strtoupper($encoding); |
| 192 | 210 | if ($encoding=="ISBN") |
| 193 | 211 | { |
| 194 | - if (!preg_match("/^978/", $ean)) $ean="978".$ean; |
|
| 212 | + if (!preg_match("/^978/", $ean)) { |
|
| 213 | + $ean="978".$ean; |
|
| 214 | + } |
|
| 215 | + } |
|
| 216 | + if (preg_match("/^978/", $ean)) { |
|
| 217 | + $encoding="ISBN"; |
|
| 195 | 218 | } |
| 196 | - if (preg_match("/^978/", $ean)) $encoding="ISBN"; |
|
| 197 | 219 | if (strlen($ean)<12 || strlen($ean)>13) |
| 198 | 220 | { |
| 199 | 221 | return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)"); |
@@ -206,8 +228,14 @@ discard block |
||
| 206 | 228 | for ($i=1;$i<13;$i++) |
| 207 | 229 | { |
| 208 | 230 | $str=$digits[$ean[$i]]; |
| 209 | - if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str; |
|
| 210 | - if ($i==6) $line.=$guards[1]; |
|
| 231 | + if ($i<7 && $mirror[$ean[0]][$i-1]==1) { |
|
| 232 | + $line.=strrev($str); |
|
| 233 | + } else { |
|
| 234 | + $line.=$str; |
|
| 235 | + } |
|
| 236 | + if ($i==6) { |
|
| 237 | + $line.=$guards[1]; |
|
| 238 | + } |
|
| 211 | 239 | } |
| 212 | 240 | $line.=$guards[2]; |
| 213 | 241 | |
@@ -216,11 +244,17 @@ discard block |
||
| 216 | 244 | $text=""; |
| 217 | 245 | for ($a=0;$a<13;$a++) |
| 218 | 246 | { |
| 219 | - if ($a>0) $text.=" "; |
|
| 247 | + if ($a>0) { |
|
| 248 | + $text.=" "; |
|
| 249 | + } |
|
| 220 | 250 | $text.="$pos:12:{$ean[$a]}"; |
| 221 | - if ($a==0) $pos+=12; |
|
| 222 | - else if ($a==6) $pos+=12; |
|
| 223 | - else $pos+=7; |
|
| 251 | + if ($a==0) { |
|
| 252 | + $pos+=12; |
|
| 253 | + } else if ($a==6) { |
|
| 254 | + $pos+=12; |
|
| 255 | + } else { |
|
| 256 | + $pos+=7; |
|
| 257 | + } |
|
| 224 | 258 | } |
| 225 | 259 | |
| 226 | 260 | return array( |
@@ -243,8 +277,12 @@ discard block |
||
| 243 | 277 | global $genbarcode_loc; |
| 244 | 278 | |
| 245 | 279 | // Clean parameters |
| 246 | - if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12); |
|
| 247 | - if (!$encoding) $encoding="ANY"; |
|
| 280 | + if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) { |
|
| 281 | + $code=substr($code,0,12); |
|
| 282 | + } |
|
| 283 | + if (!$encoding) { |
|
| 284 | + $encoding="ANY"; |
|
| 285 | + } |
|
| 248 | 286 | $encoding=preg_replace("/[\\\|]/", "_", $encoding); |
| 249 | 287 | $code=preg_replace("/[\\\|]/", "_", $code); |
| 250 | 288 | |
@@ -263,8 +301,7 @@ discard block |
||
| 263 | 301 | $text=fgets($fp, 1024); |
| 264 | 302 | $encoding=fgets($fp, 1024); |
| 265 | 303 | pclose($fp); |
| 266 | - } |
|
| 267 | - else |
|
| 304 | + } else |
|
| 268 | 305 | { |
| 269 | 306 | dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR); |
| 270 | 307 | return false; |
@@ -282,9 +319,15 @@ discard block |
||
| 282 | 319 | $ret['error']=$ret['bars']; $ret['bars']=''; |
| 283 | 320 | return $ret; |
| 284 | 321 | } |
| 285 | - if (!$ret['bars']) return false; |
|
| 286 | - if (!$ret['text']) return false; |
|
| 287 | - if (!$ret['encoding']) return false; |
|
| 322 | + if (!$ret['bars']) { |
|
| 323 | + return false; |
|
| 324 | + } |
|
| 325 | + if (!$ret['text']) { |
|
| 326 | + return false; |
|
| 327 | + } |
|
| 328 | + if (!$ret['encoding']) { |
|
| 329 | + return false; |
|
| 330 | + } |
|
| 288 | 331 | return $ret; |
| 289 | 332 | } |
| 290 | 333 | |
@@ -310,11 +353,16 @@ discard block |
||
| 310 | 353 | //var_dump($font_loc); |
| 311 | 354 | |
| 312 | 355 | /* set defaults */ |
| 313 | - if ($scale<1) $scale=2; |
|
| 356 | + if ($scale<1) { |
|
| 357 | + $scale=2; |
|
| 358 | + } |
|
| 314 | 359 | $total_y=(int) $total_y; |
| 315 | - if ($total_y<1) $total_y=(int) $scale * 60; |
|
| 316 | - if (!$space) |
|
| 317 | - $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale); |
|
| 360 | + if ($total_y<1) { |
|
| 361 | + $total_y=(int) $scale * 60; |
|
| 362 | + } |
|
| 363 | + if (!$space) { |
|
| 364 | + $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale); |
|
| 365 | + } |
|
| 318 | 366 | |
| 319 | 367 | /* count total width */ |
| 320 | 368 | $xpos=0; |
@@ -371,7 +419,9 @@ discard block |
||
| 371 | 419 | /* tall bar */ |
| 372 | 420 | $val=ord($val)-ord('a')+1; |
| 373 | 421 | $h=$height2; |
| 374 | - } else $h=$height; |
|
| 422 | + } else { |
|
| 423 | + $h=$height; |
|
| 424 | + } |
|
| 375 | 425 | imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar); |
| 376 | 426 | $xpos+=$val*$scale; |
| 377 | 427 | $width=true; |
@@ -396,17 +446,16 @@ discard block |
||
| 396 | 446 | { |
| 397 | 447 | header("Content-Type: image/jpeg; name=\"barcode.jpg\""); |
| 398 | 448 | imagejpeg($im); |
| 399 | - } |
|
| 400 | - else if ($mode=='gif') |
|
| 449 | + } else if ($mode=='gif') |
|
| 401 | 450 | { |
| 402 | 451 | header("Content-Type: image/gif; name=\"barcode.gif\""); |
| 403 | 452 | imagegif($im); |
| 404 | - } |
|
| 405 | - else if (! empty($filebarcode)) // To wxrite into afile onto disk |
|
| 453 | + } else if (! empty($filebarcode)) { |
|
| 454 | + // To wxrite into afile onto disk |
|
| 406 | 455 | { |
| 407 | 456 | imagepng($im,$filebarcode); |
| 408 | 457 | } |
| 409 | - else |
|
| 458 | + } else |
|
| 410 | 459 | { |
| 411 | 460 | header("Content-Type: image/png; name=\"barcode.png\""); |
| 412 | 461 | imagepng($im); |
@@ -31,25 +31,25 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function accounting_prepare_head(AccountingAccount $object) |
| 33 | 33 | { |
| 34 | - global $langs, $conf; |
|
| 34 | + global $langs, $conf; |
|
| 35 | 35 | |
| 36 | - $h = 0; |
|
| 37 | - $head = array (); |
|
| 36 | + $h = 0; |
|
| 37 | + $head = array (); |
|
| 38 | 38 | |
| 39 | - $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id; |
|
| 40 | - $head[$h][1] = $langs->trans("Card"); |
|
| 41 | - $head[$h][2] = 'card'; |
|
| 42 | - $h ++; |
|
| 39 | + $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id; |
|
| 40 | + $head[$h][1] = $langs->trans("Card"); |
|
| 41 | + $head[$h][2] = 'card'; |
|
| 42 | + $h ++; |
|
| 43 | 43 | |
| 44 | - // Show more tabs from modules |
|
| 45 | - // Entries must be declared in modules descriptor with line |
|
| 46 | - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 47 | - // $this->tabs = array('entity:-tabname); to remove a tab |
|
| 48 | - complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account'); |
|
| 44 | + // Show more tabs from modules |
|
| 45 | + // Entries must be declared in modules descriptor with line |
|
| 46 | + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 47 | + // $this->tabs = array('entity:-tabname); to remove a tab |
|
| 48 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account'); |
|
| 49 | 49 | |
| 50 | - complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove'); |
|
| 50 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove'); |
|
| 51 | 51 | |
| 52 | - return $head; |
|
| 52 | + return $head; |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | function clean_account($account) |
| 62 | 62 | { |
| 63 | - $account = rtrim($account,"0"); |
|
| 63 | + $account = rtrim($account,"0"); |
|
| 64 | 64 | |
| 65 | - return $account; |
|
| 65 | + return $account; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -73,31 +73,31 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | function length_accountg($account) |
| 75 | 75 | { |
| 76 | - global $conf; |
|
| 76 | + global $conf; |
|
| 77 | 77 | |
| 78 | - if ($account < 0 || empty($account)) return ''; |
|
| 78 | + if ($account < 0 || empty($account)) return ''; |
|
| 79 | 79 | |
| 80 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account; |
|
| 80 | + if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account; |
|
| 81 | 81 | |
| 82 | - $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; |
|
| 83 | - if (! empty($g)) { |
|
| 84 | - // Clean parameters |
|
| 85 | - $i = strlen($account); |
|
| 82 | + $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; |
|
| 83 | + if (! empty($g)) { |
|
| 84 | + // Clean parameters |
|
| 85 | + $i = strlen($account); |
|
| 86 | 86 | |
| 87 | - if ($i >= 1) { |
|
| 88 | - while ( $i < $g ) { |
|
| 89 | - $account .= '0'; |
|
| 87 | + if ($i >= 1) { |
|
| 88 | + while ( $i < $g ) { |
|
| 89 | + $account .= '0'; |
|
| 90 | 90 | |
| 91 | - $i ++; |
|
| 92 | - } |
|
| 91 | + $i ++; |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - return $account; |
|
| 95 | - } else { |
|
| 96 | - return $account; |
|
| 97 | - } |
|
| 98 | - } else { |
|
| 99 | - return $account; |
|
| 100 | - } |
|
| 94 | + return $account; |
|
| 95 | + } else { |
|
| 96 | + return $account; |
|
| 97 | + } |
|
| 98 | + } else { |
|
| 99 | + return $account; |
|
| 100 | + } |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -108,31 +108,31 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | function length_accounta($accounta) |
| 110 | 110 | { |
| 111 | - global $conf, $langs; |
|
| 111 | + global $conf, $langs; |
|
| 112 | 112 | |
| 113 | - if ($accounta < 0 || empty($accounta)) return ''; |
|
| 113 | + if ($accounta < 0 || empty($accounta)) return ''; |
|
| 114 | 114 | |
| 115 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta; |
|
| 115 | + if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta; |
|
| 116 | 116 | |
| 117 | - $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; |
|
| 118 | - if (! empty($a)) { |
|
| 119 | - // Clean parameters |
|
| 120 | - $i = strlen($accounta); |
|
| 117 | + $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; |
|
| 118 | + if (! empty($a)) { |
|
| 119 | + // Clean parameters |
|
| 120 | + $i = strlen($accounta); |
|
| 121 | 121 | |
| 122 | - if ($i >= 1) { |
|
| 123 | - while ( $i < $a ) { |
|
| 124 | - $accounta .= '0'; |
|
| 122 | + if ($i >= 1) { |
|
| 123 | + while ( $i < $a ) { |
|
| 124 | + $accounta .= '0'; |
|
| 125 | 125 | |
| 126 | - $i ++; |
|
| 127 | - } |
|
| 126 | + $i ++; |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | - return $accounta; |
|
| 130 | - } else { |
|
| 131 | - return $accounta; |
|
| 132 | - } |
|
| 133 | - } else { |
|
| 134 | - return $accounta; |
|
| 135 | - } |
|
| 129 | + return $accounta; |
|
| 130 | + } else { |
|
| 131 | + return $accounta; |
|
| 132 | + } |
|
| 133 | + } else { |
|
| 134 | + return $accounta; |
|
| 135 | + } |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | global $langs, $conf; |
| 35 | 35 | |
| 36 | 36 | $h = 0; |
| 37 | - $head = array (); |
|
| 37 | + $head = array(); |
|
| 38 | 38 | |
| 39 | - $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id; |
|
| 39 | + $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id; |
|
| 40 | 40 | $head[$h][1] = $langs->trans("Card"); |
| 41 | 41 | $head[$h][2] = 'card'; |
| 42 | - $h ++; |
|
| 42 | + $h++; |
|
| 43 | 43 | |
| 44 | 44 | // Show more tabs from modules |
| 45 | 45 | // Entries must be declared in modules descriptor with line |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | function clean_account($account) |
| 62 | 62 | { |
| 63 | - $account = rtrim($account,"0"); |
|
| 63 | + $account = rtrim($account, "0"); |
|
| 64 | 64 | |
| 65 | 65 | return $account; |
| 66 | 66 | } |
@@ -77,18 +77,18 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | if ($account < 0 || empty($account)) return ''; |
| 79 | 79 | |
| 80 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account; |
|
| 80 | + if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account; |
|
| 81 | 81 | |
| 82 | 82 | $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; |
| 83 | - if (! empty($g)) { |
|
| 83 | + if (!empty($g)) { |
|
| 84 | 84 | // Clean parameters |
| 85 | 85 | $i = strlen($account); |
| 86 | 86 | |
| 87 | 87 | if ($i >= 1) { |
| 88 | - while ( $i < $g ) { |
|
| 88 | + while ($i < $g) { |
|
| 89 | 89 | $account .= '0'; |
| 90 | 90 | |
| 91 | - $i ++; |
|
| 91 | + $i++; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | return $account; |
@@ -112,18 +112,18 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | if ($accounta < 0 || empty($accounta)) return ''; |
| 114 | 114 | |
| 115 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta; |
|
| 115 | + if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta; |
|
| 116 | 116 | |
| 117 | 117 | $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; |
| 118 | - if (! empty($a)) { |
|
| 118 | + if (!empty($a)) { |
|
| 119 | 119 | // Clean parameters |
| 120 | 120 | $i = strlen($accounta); |
| 121 | 121 | |
| 122 | 122 | if ($i >= 1) { |
| 123 | - while ( $i < $a ) { |
|
| 123 | + while ($i < $a) { |
|
| 124 | 124 | $accounta .= '0'; |
| 125 | 125 | |
| 126 | - $i ++; |
|
| 126 | + $i++; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | return $accounta; |
@@ -152,17 +152,17 @@ discard block |
||
| 152 | 152 | * @param string $varlink Add a variable into the address of the page |
| 153 | 153 | * @return void |
| 154 | 154 | */ |
| 155 | -function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='') |
|
| 155 | +function journalHead($nom, $variante, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '') |
|
| 156 | 156 | { |
| 157 | 157 | global $langs; |
| 158 | 158 | |
| 159 | - if (empty($hselected)) $hselected='report'; |
|
| 159 | + if (empty($hselected)) $hselected = 'report'; |
|
| 160 | 160 | |
| 161 | 161 | print "\n\n<!-- debut cartouche journal -->\n"; |
| 162 | 162 | |
| 163 | - if(! empty($varlink)) $varlink = '?'.$varlink; |
|
| 163 | + if (!empty($varlink)) $varlink = '?'.$varlink; |
|
| 164 | 164 | |
| 165 | - $h=0; |
|
| 165 | + $h = 0; |
|
| 166 | 166 | $head[$h][0] = $_SERVER["PHP_SELF"].$varlink; |
| 167 | 167 | $head[$h][1] = $langs->trans("Journalization"); |
| 168 | 168 | $head[$h][2] = 'journal'; |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | dol_fiche_head($head, 'journal'); |
| 173 | 173 | |
| 174 | - foreach($moreparam as $key => $value) |
|
| 174 | + foreach ($moreparam as $key => $value) |
|
| 175 | 175 | { |
| 176 | 176 | print '<input type="hidden" name="'.$key.'" value="'.$value.'">'; |
| 177 | 177 | } |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | // Ligne de titre |
| 181 | 181 | print '<tr>'; |
| 182 | 182 | print '<td width="110">'.$langs->trans("Name").'</td>'; |
| 183 | - if (! $variantexxx) print '<td colspan="3">'; |
|
| 183 | + if (!$variantexxx) print '<td colspan="3">'; |
|
| 184 | 184 | else print '<td>'; |
| 185 | 185 | print $nom; |
| 186 | 186 | if ($variantexxx) print '</td><td colspan="2">'.$variantexxx; |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | { |
| 193 | 193 | print '<tr>'; |
| 194 | 194 | print '<td width="110">'.$langs->trans("CalculationMode").'</td>'; |
| 195 | - if (! $variante) print '<td colspan="3">'; |
|
| 195 | + if (!$variante) print '<td colspan="3">'; |
|
| 196 | 196 | else print '<td>'; |
| 197 | 197 | print $calcmode; |
| 198 | 198 | if ($variante) print '</td><td colspan="2">'.$variante; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | // Ligne de la periode d'analyse du rapport |
| 204 | 204 | print '<tr>'; |
| 205 | 205 | print '<td>'.$langs->trans("ReportPeriod").'</td>'; |
| 206 | - if (! $periodlink) print '<td colspan="3">'; |
|
| 206 | + if (!$periodlink) print '<td colspan="3">'; |
|
| 207 | 207 | else print '<td>'; |
| 208 | 208 | if ($period) print $period; |
| 209 | 209 | if ($periodlink) print '</td><td colspan="2">'.$periodlink; |
@@ -75,9 +75,13 @@ discard block |
||
| 75 | 75 | { |
| 76 | 76 | global $conf; |
| 77 | 77 | |
| 78 | - if ($account < 0 || empty($account)) return ''; |
|
| 78 | + if ($account < 0 || empty($account)) { |
|
| 79 | + return ''; |
|
| 80 | + } |
|
| 79 | 81 | |
| 80 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account; |
|
| 82 | + if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) { |
|
| 83 | + return $account; |
|
| 84 | + } |
|
| 81 | 85 | |
| 82 | 86 | $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT; |
| 83 | 87 | if (! empty($g)) { |
@@ -110,9 +114,13 @@ discard block |
||
| 110 | 114 | { |
| 111 | 115 | global $conf, $langs; |
| 112 | 116 | |
| 113 | - if ($accounta < 0 || empty($accounta)) return ''; |
|
| 117 | + if ($accounta < 0 || empty($accounta)) { |
|
| 118 | + return ''; |
|
| 119 | + } |
|
| 114 | 120 | |
| 115 | - if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta; |
|
| 121 | + if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) { |
|
| 122 | + return $accounta; |
|
| 123 | + } |
|
| 116 | 124 | |
| 117 | 125 | $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT; |
| 118 | 126 | if (! empty($a)) { |
@@ -156,11 +164,15 @@ discard block |
||
| 156 | 164 | { |
| 157 | 165 | global $langs; |
| 158 | 166 | |
| 159 | - if (empty($hselected)) $hselected='report'; |
|
| 167 | + if (empty($hselected)) { |
|
| 168 | + $hselected='report'; |
|
| 169 | + } |
|
| 160 | 170 | |
| 161 | 171 | print "\n\n<!-- debut cartouche journal -->\n"; |
| 162 | 172 | |
| 163 | - if(! empty($varlink)) $varlink = '?'.$varlink; |
|
| 173 | + if(! empty($varlink)) { |
|
| 174 | + $varlink = '?'.$varlink; |
|
| 175 | + } |
|
| 164 | 176 | |
| 165 | 177 | $h=0; |
| 166 | 178 | $head[$h][0] = $_SERVER["PHP_SELF"].$varlink; |
@@ -180,10 +192,15 @@ discard block |
||
| 180 | 192 | // Ligne de titre |
| 181 | 193 | print '<tr>'; |
| 182 | 194 | print '<td width="110">'.$langs->trans("Name").'</td>'; |
| 183 | - if (! $variantexxx) print '<td colspan="3">'; |
|
| 184 | - else print '<td>'; |
|
| 195 | + if (! $variantexxx) { |
|
| 196 | + print '<td colspan="3">'; |
|
| 197 | + } else { |
|
| 198 | + print '<td>'; |
|
| 199 | + } |
|
| 185 | 200 | print $nom; |
| 186 | - if ($variantexxx) print '</td><td colspan="2">'.$variantexxx; |
|
| 201 | + if ($variantexxx) { |
|
| 202 | + print '</td><td colspan="2">'.$variantexxx; |
|
| 203 | + } |
|
| 187 | 204 | print '</td>'; |
| 188 | 205 | print '</tr>'; |
| 189 | 206 | |
@@ -192,10 +209,15 @@ discard block |
||
| 192 | 209 | { |
| 193 | 210 | print '<tr>'; |
| 194 | 211 | print '<td width="110">'.$langs->trans("CalculationMode").'</td>'; |
| 195 | - if (! $variante) print '<td colspan="3">'; |
|
| 196 | - else print '<td>'; |
|
| 212 | + if (! $variante) { |
|
| 213 | + print '<td colspan="3">'; |
|
| 214 | + } else { |
|
| 215 | + print '<td>'; |
|
| 216 | + } |
|
| 197 | 217 | print $calcmode; |
| 198 | - if ($variante) print '</td><td colspan="2">'.$variante; |
|
| 218 | + if ($variante) { |
|
| 219 | + print '</td><td colspan="2">'.$variante; |
|
| 220 | + } |
|
| 199 | 221 | print '</td>'; |
| 200 | 222 | print '</tr>'; |
| 201 | 223 | } |
@@ -203,10 +225,17 @@ discard block |
||
| 203 | 225 | // Ligne de la periode d'analyse du rapport |
| 204 | 226 | print '<tr>'; |
| 205 | 227 | print '<td>'.$langs->trans("ReportPeriod").'</td>'; |
| 206 | - if (! $periodlink) print '<td colspan="3">'; |
|
| 207 | - else print '<td>'; |
|
| 208 | - if ($period) print $period; |
|
| 209 | - if ($periodlink) print '</td><td colspan="2">'.$periodlink; |
|
| 228 | + if (! $periodlink) { |
|
| 229 | + print '<td colspan="3">'; |
|
| 230 | + } else { |
|
| 231 | + print '<td>'; |
|
| 232 | + } |
|
| 233 | + if ($period) { |
|
| 234 | + print $period; |
|
| 235 | + } |
|
| 236 | + if ($periodlink) { |
|
| 237 | + print '</td><td colspan="2">'.$periodlink; |
|
| 238 | + } |
|
| 210 | 239 | print '</td>'; |
| 211 | 240 | print '</tr>'; |
| 212 | 241 | |
@@ -31,70 +31,70 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function resource_prepare_head($object) |
| 33 | 33 | { |
| 34 | - global $langs, $conf, $user; |
|
| 35 | - $h = 0; |
|
| 36 | - $head = array(); |
|
| 37 | - |
|
| 38 | - $head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id; |
|
| 39 | - $head[$h][1] = $langs->trans("ResourceCard"); |
|
| 40 | - $head[$h][2] = 'resource'; |
|
| 41 | - $h++; |
|
| 42 | - |
|
| 43 | - if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) |
|
| 44 | - { |
|
| 45 | - $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); |
|
| 46 | - $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; |
|
| 47 | - $head[$h][1] = $langs->trans('ContactsAddresses'); |
|
| 48 | - if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 49 | - $head[$h][2] = 'contact'; |
|
| 50 | - $h++; |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - // Show more tabs from modules |
|
| 54 | - // Entries must be declared in modules descriptor with line |
|
| 55 | - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 56 | - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 57 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'resource'); |
|
| 58 | - |
|
| 59 | - if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) |
|
| 60 | - { |
|
| 61 | - $nbNote = 0; |
|
| 62 | - if(!empty($object->note_private)) $nbNote++; |
|
| 63 | - if(!empty($object->note_public)) $nbNote++; |
|
| 64 | - $head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id; |
|
| 65 | - $head[$h][1] = $langs->trans('Notes'); |
|
| 66 | - if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 67 | - $head[$h][2] = 'note'; |
|
| 68 | - $h++; |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
|
| 72 | - $upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 73 | - $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 74 | - $head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id; |
|
| 75 | - $head[$h][1] = $langs->trans("Documents"); |
|
| 76 | - if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 77 | - $head[$h][2] = 'documents'; |
|
| 78 | - $h++; |
|
| 79 | - |
|
| 80 | - $head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id; |
|
| 81 | - $head[$h][1] = $langs->trans("Events"); |
|
| 82 | - if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) |
|
| 83 | - { |
|
| 84 | - $head[$h][1].= '/'; |
|
| 85 | - $head[$h][1].= $langs->trans("Agenda"); |
|
| 86 | - } |
|
| 87 | - $head[$h][2] = 'agenda'; |
|
| 88 | - $h++; |
|
| 89 | - |
|
| 90 | - /*$head[$h][0] = DOL_URL_ROOT.'/resource/info.php?id='.$object->id; |
|
| 34 | + global $langs, $conf, $user; |
|
| 35 | + $h = 0; |
|
| 36 | + $head = array(); |
|
| 37 | + |
|
| 38 | + $head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id; |
|
| 39 | + $head[$h][1] = $langs->trans("ResourceCard"); |
|
| 40 | + $head[$h][2] = 'resource'; |
|
| 41 | + $h++; |
|
| 42 | + |
|
| 43 | + if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) |
|
| 44 | + { |
|
| 45 | + $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); |
|
| 46 | + $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; |
|
| 47 | + $head[$h][1] = $langs->trans('ContactsAddresses'); |
|
| 48 | + if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 49 | + $head[$h][2] = 'contact'; |
|
| 50 | + $h++; |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + // Show more tabs from modules |
|
| 54 | + // Entries must be declared in modules descriptor with line |
|
| 55 | + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 56 | + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 57 | + complete_head_from_modules($conf,$langs,$object,$head,$h,'resource'); |
|
| 58 | + |
|
| 59 | + if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) |
|
| 60 | + { |
|
| 61 | + $nbNote = 0; |
|
| 62 | + if(!empty($object->note_private)) $nbNote++; |
|
| 63 | + if(!empty($object->note_public)) $nbNote++; |
|
| 64 | + $head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id; |
|
| 65 | + $head[$h][1] = $langs->trans('Notes'); |
|
| 66 | + if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 67 | + $head[$h][2] = 'note'; |
|
| 68 | + $h++; |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
|
| 72 | + $upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 73 | + $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 74 | + $head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id; |
|
| 75 | + $head[$h][1] = $langs->trans("Documents"); |
|
| 76 | + if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 77 | + $head[$h][2] = 'documents'; |
|
| 78 | + $h++; |
|
| 79 | + |
|
| 80 | + $head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id; |
|
| 81 | + $head[$h][1] = $langs->trans("Events"); |
|
| 82 | + if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) |
|
| 83 | + { |
|
| 84 | + $head[$h][1].= '/'; |
|
| 85 | + $head[$h][1].= $langs->trans("Agenda"); |
|
| 86 | + } |
|
| 87 | + $head[$h][2] = 'agenda'; |
|
| 88 | + $h++; |
|
| 89 | + |
|
| 90 | + /*$head[$h][0] = DOL_URL_ROOT.'/resource/info.php?id='.$object->id; |
|
| 91 | 91 | $head[$h][1] = $langs->trans('Info'); |
| 92 | 92 | $head[$h][2] = 'info'; |
| 93 | 93 | $h++;*/ |
| 94 | 94 | |
| 95 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove'); |
|
| 95 | + complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove'); |
|
| 96 | 96 | |
| 97 | - return $head; |
|
| 97 | + return $head; |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -105,28 +105,28 @@ discard block |
||
| 105 | 105 | function resource_admin_prepare_head() |
| 106 | 106 | { |
| 107 | 107 | |
| 108 | - global $langs, $conf, $user; |
|
| 108 | + global $langs, $conf, $user; |
|
| 109 | 109 | |
| 110 | - $h = 0; |
|
| 111 | - $head = array(); |
|
| 110 | + $h = 0; |
|
| 111 | + $head = array(); |
|
| 112 | 112 | |
| 113 | - $head[$h][0] = DOL_URL_ROOT.'/admin/resource.php'; |
|
| 114 | - $head[$h][1] = $langs->trans("ResourceSetup"); |
|
| 115 | - $head[$h][2] = 'general'; |
|
| 116 | - $h++; |
|
| 113 | + $head[$h][0] = DOL_URL_ROOT.'/admin/resource.php'; |
|
| 114 | + $head[$h][1] = $langs->trans("ResourceSetup"); |
|
| 115 | + $head[$h][2] = 'general'; |
|
| 116 | + $h++; |
|
| 117 | 117 | |
| 118 | - // Show more tabs from modules |
|
| 119 | - // Entries must be declared in modules descriptor with line |
|
| 120 | - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 121 | - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 122 | - complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin'); |
|
| 118 | + // Show more tabs from modules |
|
| 119 | + // Entries must be declared in modules descriptor with line |
|
| 120 | + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
|
| 121 | + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
|
| 122 | + complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin'); |
|
| 123 | 123 | |
| 124 | - $head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php'; |
|
| 125 | - $head[$h][1] = $langs->trans("ExtraFields"); |
|
| 126 | - $head[$h][2] = 'attributes'; |
|
| 127 | - $h++; |
|
| 124 | + $head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php'; |
|
| 125 | + $head[$h][1] = $langs->trans("ExtraFields"); |
|
| 126 | + $head[$h][2] = 'attributes'; |
|
| 127 | + $h++; |
|
| 128 | 128 | |
| 129 | - complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove'); |
|
| 129 | + complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove'); |
|
| 130 | 130 | |
| 131 | - return $head; |
|
| 131 | + return $head; |
|
| 132 | 132 | } |
@@ -35,17 +35,17 @@ discard block |
||
| 35 | 35 | $h = 0; |
| 36 | 36 | $head = array(); |
| 37 | 37 | |
| 38 | - $head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id; |
|
| 38 | + $head[$h][0] = dol_buildpath('/resource/card.php', 1).'?id='.$object->id; |
|
| 39 | 39 | $head[$h][1] = $langs->trans("ResourceCard"); |
| 40 | 40 | $head[$h][2] = 'resource'; |
| 41 | 41 | $h++; |
| 42 | 42 | |
| 43 | 43 | if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) |
| 44 | 44 | { |
| 45 | - $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); |
|
| 45 | + $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); |
|
| 46 | 46 | $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; |
| 47 | 47 | $head[$h][1] = $langs->trans('ContactsAddresses'); |
| 48 | - if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 48 | + if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 49 | 49 | $head[$h][2] = 'contact'; |
| 50 | 50 | $h++; |
| 51 | 51 | } |
@@ -54,35 +54,35 @@ discard block |
||
| 54 | 54 | // Entries must be declared in modules descriptor with line |
| 55 | 55 | // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
| 56 | 56 | // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
| 57 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'resource'); |
|
| 57 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource'); |
|
| 58 | 58 | |
| 59 | 59 | if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) |
| 60 | 60 | { |
| 61 | 61 | $nbNote = 0; |
| 62 | - if(!empty($object->note_private)) $nbNote++; |
|
| 63 | - if(!empty($object->note_public)) $nbNote++; |
|
| 62 | + if (!empty($object->note_private)) $nbNote++; |
|
| 63 | + if (!empty($object->note_public)) $nbNote++; |
|
| 64 | 64 | $head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id; |
| 65 | 65 | $head[$h][1] = $langs->trans('Notes'); |
| 66 | - if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 66 | + if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 67 | 67 | $head[$h][2] = 'note'; |
| 68 | 68 | $h++; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 72 | - $upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref); |
|
| 73 | - $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
|
| 72 | + $upload_dir = $conf->resource->dir_output."/".dol_sanitizeFileName($object->ref); |
|
| 73 | + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); |
|
| 74 | 74 | $head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id; |
| 75 | 75 | $head[$h][1] = $langs->trans("Documents"); |
| 76 | - if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 76 | + if ($nbFiles > 0) $head[$h][1] .= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 77 | 77 | $head[$h][2] = 'documents'; |
| 78 | 78 | $h++; |
| 79 | 79 | |
| 80 | 80 | $head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id; |
| 81 | 81 | $head[$h][1] = $langs->trans("Events"); |
| 82 | - if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) |
|
| 82 | + if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) |
|
| 83 | 83 | { |
| 84 | - $head[$h][1].= '/'; |
|
| 85 | - $head[$h][1].= $langs->trans("Agenda"); |
|
| 84 | + $head[$h][1] .= '/'; |
|
| 85 | + $head[$h][1] .= $langs->trans("Agenda"); |
|
| 86 | 86 | } |
| 87 | 87 | $head[$h][2] = 'agenda'; |
| 88 | 88 | $h++; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $head[$h][2] = 'info'; |
| 93 | 93 | $h++;*/ |
| 94 | 94 | |
| 95 | - complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove'); |
|
| 95 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource', 'remove'); |
|
| 96 | 96 | |
| 97 | 97 | return $head; |
| 98 | 98 | } |
@@ -119,14 +119,14 @@ discard block |
||
| 119 | 119 | // Entries must be declared in modules descriptor with line |
| 120 | 120 | // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab |
| 121 | 121 | // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab |
| 122 | - complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin'); |
|
| 122 | + complete_head_from_modules($conf, $langs, null, $head, $h, 'resource_admin'); |
|
| 123 | 123 | |
| 124 | 124 | $head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php'; |
| 125 | 125 | $head[$h][1] = $langs->trans("ExtraFields"); |
| 126 | 126 | $head[$h][2] = 'attributes'; |
| 127 | 127 | $h++; |
| 128 | 128 | |
| 129 | - complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove'); |
|
| 129 | + complete_head_from_modules($conf, $langs, null, $head, $h, 'resource_admin', 'remove'); |
|
| 130 | 130 | |
| 131 | 131 | return $head; |
| 132 | 132 | } |
@@ -45,7 +45,9 @@ discard block |
||
| 45 | 45 | $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); |
| 46 | 46 | $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; |
| 47 | 47 | $head[$h][1] = $langs->trans('ContactsAddresses'); |
| 48 | - if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 48 | + if ($nbContact > 0) { |
|
| 49 | + $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; |
|
| 50 | + } |
|
| 49 | 51 | $head[$h][2] = 'contact'; |
| 50 | 52 | $h++; |
| 51 | 53 | } |
@@ -59,11 +61,17 @@ discard block |
||
| 59 | 61 | if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) |
| 60 | 62 | { |
| 61 | 63 | $nbNote = 0; |
| 62 | - if(!empty($object->note_private)) $nbNote++; |
|
| 63 | - if(!empty($object->note_public)) $nbNote++; |
|
| 64 | + if(!empty($object->note_private)) { |
|
| 65 | + $nbNote++; |
|
| 66 | + } |
|
| 67 | + if(!empty($object->note_public)) { |
|
| 68 | + $nbNote++; |
|
| 69 | + } |
|
| 64 | 70 | $head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id; |
| 65 | 71 | $head[$h][1] = $langs->trans('Notes'); |
| 66 | - if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 72 | + if ($nbNote > 0) { |
|
| 73 | + $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>'; |
|
| 74 | + } |
|
| 67 | 75 | $head[$h][2] = 'note'; |
| 68 | 76 | $h++; |
| 69 | 77 | } |
@@ -73,7 +81,9 @@ discard block |
||
| 73 | 81 | $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$')); |
| 74 | 82 | $head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id; |
| 75 | 83 | $head[$h][1] = $langs->trans("Documents"); |
| 76 | - if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 84 | + if($nbFiles > 0) { |
|
| 85 | + $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>'; |
|
| 86 | + } |
|
| 77 | 87 | $head[$h][2] = 'documents'; |
| 78 | 88 | $h++; |
| 79 | 89 | |
@@ -65,32 +65,32 @@ |
||
| 65 | 65 | $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password'; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if (! $error && $fuser->statut == 0) |
|
| 69 | - { |
|
| 70 | - $error++; |
|
| 71 | - $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled'; |
|
| 72 | - } |
|
| 68 | + if (! $error && $fuser->statut == 0) |
|
| 69 | + { |
|
| 70 | + $error++; |
|
| 71 | + $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled'; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - // Validation of login |
|
| 75 | - if (! $error) |
|
| 76 | - { |
|
| 77 | - $fuser->getrights(); // Load permission of user |
|
| 74 | + // Validation of login |
|
| 75 | + if (! $error) |
|
| 76 | + { |
|
| 77 | + $fuser->getrights(); // Load permission of user |
|
| 78 | 78 | |
| 79 | - // Authentication mode |
|
| 80 | - if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr'; |
|
| 81 | - // Authentication mode: forceuser |
|
| 82 | - if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto'; |
|
| 83 | - // Set authmode |
|
| 84 | - $authmode=explode(',',$dolibarr_main_authentication); |
|
| 79 | + // Authentication mode |
|
| 80 | + if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr'; |
|
| 81 | + // Authentication mode: forceuser |
|
| 82 | + if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto'; |
|
| 83 | + // Set authmode |
|
| 84 | + $authmode=explode(',',$dolibarr_main_authentication); |
|
| 85 | 85 | |
| 86 | 86 | include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; |
| 87 | - $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode); |
|
| 88 | - if (empty($login)) |
|
| 89 | - { |
|
| 90 | - $error++; |
|
| 87 | + $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode); |
|
| 88 | + if (empty($login)) |
|
| 89 | + { |
|
| 90 | + $error++; |
|
| 91 | 91 | $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password'; |
| 92 | - } |
|
| 93 | - } |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | return $fuser; |
@@ -32,63 +32,63 @@ |
||
| 32 | 32 | * @param string $errorlabel Error string label |
| 33 | 33 | * @return User Return user object identified by login/pass/entity into authentication array |
| 34 | 34 | */ |
| 35 | -function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) |
|
| 35 | +function check_authentication($authentication, &$error, &$errorcode, &$errorlabel) |
|
| 36 | 36 | { |
| 37 | - global $db,$conf,$langs; |
|
| 38 | - global $dolibarr_main_authentication,$dolibarr_auto_user; |
|
| 37 | + global $db, $conf, $langs; |
|
| 38 | + global $dolibarr_main_authentication, $dolibarr_auto_user; |
|
| 39 | 39 | |
| 40 | - $fuser=new User($db); |
|
| 40 | + $fuser = new User($db); |
|
| 41 | 41 | |
| 42 | - if (! $error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY)) |
|
| 42 | + if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY)) |
|
| 43 | 43 | { |
| 44 | 44 | $error++; |
| 45 | - $errorcode='BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel='Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup'; |
|
| 45 | + $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup'; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity'])) |
|
| 48 | + if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity'])) |
|
| 49 | 49 | { |
| 50 | 50 | $error++; |
| 51 | - $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used)."; |
|
| 51 | + $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used)."; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - if (! $error) |
|
| 54 | + if (!$error) |
|
| 55 | 55 | { |
| 56 | - $result=$fuser->fetch('',$authentication['login'],'',0); |
|
| 56 | + $result = $fuser->fetch('', $authentication['login'], '', 0); |
|
| 57 | 57 | if ($result < 0) |
| 58 | 58 | { |
| 59 | 59 | $error++; |
| 60 | - $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user'; |
|
| 60 | + $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user'; |
|
| 61 | 61 | } |
| 62 | 62 | else if ($result == 0) |
| 63 | 63 | { |
| 64 | 64 | $error++; |
| 65 | - $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password'; |
|
| 65 | + $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password'; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if (! $error && $fuser->statut == 0) |
|
| 68 | + if (!$error && $fuser->statut == 0) |
|
| 69 | 69 | { |
| 70 | 70 | $error++; |
| 71 | - $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled'; |
|
| 71 | + $errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled'; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Validation of login |
| 75 | - if (! $error) |
|
| 75 | + if (!$error) |
|
| 76 | 76 | { |
| 77 | - $fuser->getrights(); // Load permission of user |
|
| 77 | + $fuser->getrights(); // Load permission of user |
|
| 78 | 78 | |
| 79 | 79 | // Authentication mode |
| 80 | - if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr'; |
|
| 80 | + if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr'; |
|
| 81 | 81 | // Authentication mode: forceuser |
| 82 | - if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto'; |
|
| 82 | + if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto'; |
|
| 83 | 83 | // Set authmode |
| 84 | - $authmode=explode(',',$dolibarr_main_authentication); |
|
| 84 | + $authmode = explode(',', $dolibarr_main_authentication); |
|
| 85 | 85 | |
| 86 | 86 | include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; |
| 87 | - $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode); |
|
| 87 | + $login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode); |
|
| 88 | 88 | if (empty($login)) |
| 89 | 89 | { |
| 90 | 90 | $error++; |
| 91 | - $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password'; |
|
| 91 | + $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password'; |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -58,8 +58,7 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | $error++; |
| 60 | 60 | $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user'; |
| 61 | - } |
|
| 62 | - else if ($result == 0) |
|
| 61 | + } else if ($result == 0) |
|
| 63 | 62 | { |
| 64 | 63 | $error++; |
| 65 | 64 | $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password'; |
@@ -77,9 +76,13 @@ discard block |
||
| 77 | 76 | $fuser->getrights(); // Load permission of user |
| 78 | 77 | |
| 79 | 78 | // Authentication mode |
| 80 | - if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr'; |
|
| 79 | + if (empty($dolibarr_main_authentication)) { |
|
| 80 | + $dolibarr_main_authentication='http,dolibarr'; |
|
| 81 | + } |
|
| 81 | 82 | // Authentication mode: forceuser |
| 82 | - if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto'; |
|
| 83 | + if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) { |
|
| 84 | + $dolibarr_auto_user='auto'; |
|
| 85 | + } |
|
| 83 | 86 | // Set authmode |
| 84 | 87 | $authmode=explode(',',$dolibarr_main_authentication); |
| 85 | 88 | |
