@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | if (!is_object($formadmin)) { |
| 38 | - require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; |
|
| 38 | + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; |
|
| 39 | 39 | $formadmin = new FormAdmin($db); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -69,19 +69,19 @@ discard block |
||
| 69 | 69 | 'mode_key' => $info[0], |
| 70 | 70 | 'field_key' => $info[1], |
| 71 | 71 | 'value' => $info[2], |
| 72 | - 'target' => 'block_' . $mode_key, |
|
| 72 | + 'target' => 'block_'.$mode_key, |
|
| 73 | 73 | ); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true); |
| 77 | - $prefix_html_name = $mode_key . '_'; |
|
| 77 | + $prefix_html_name = $mode_key.'_'; |
|
| 78 | 78 | |
| 79 | - print '<div id="block_' . $mode_key . '">'; |
|
| 79 | + print '<div id="block_'.$mode_key.'">'; |
|
| 80 | 80 | print load_fiche_titre($langs->trans($mode_info['label']), '', ''); |
| 81 | 81 | print '<div class="fichecenter">'; |
| 82 | 82 | print '<div class="fichehalfleft">'; |
| 83 | 83 | print '<div class="underbanner clearboth"></div>'; |
| 84 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 84 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 85 | 85 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 86 | 86 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 87 | 87 | // Discard if extrafield is a hidden field on form |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | print '<table class="border centpercent tableforfield">'; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $html_name = $prefix_html_name . $field_key; |
|
| 105 | + $html_name = $prefix_html_name.$field_key; |
|
| 106 | 106 | if (!empty($field_info['enabled_field'])) { |
| 107 | 107 | $info = explode(':', $field_info['enabled_field']); |
| 108 | 108 | $enabled_field_info[] = array( |
| 109 | 109 | 'mode_key' => $info[0], |
| 110 | 110 | 'field_key' => $info[1], |
| 111 | 111 | 'value' => $info[2], |
| 112 | - 'target' => 'field_' . $html_name, |
|
| 112 | + 'target' => 'field_'.$html_name, |
|
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | $more_class .= ' tdtop'; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td'; |
|
| 125 | - print ' class="titlefieldcreate' . $more_class . '">'; |
|
| 124 | + print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td'; |
|
| 125 | + print ' class="titlefieldcreate'.$more_class.'">'; |
|
| 126 | 126 | if (!empty($field_info['help'])) { |
| 127 | 127 | print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help'])); |
| 128 | 128 | } else { |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | } |
| 222 | 222 | }); |
| 223 | 223 | </script> |
| 224 | -SCRIPT; |
|
| 224 | +script; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | ?> |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '<div class="fichecenter">'; |
| 68 | 68 | print '<div class="fichehalfleft">'; |
| 69 | 69 | print '<div class="underbanner clearboth"></div>'; |
| 70 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 70 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 71 | 71 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 72 | 72 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 73 | 73 | if (!empty($field_info['enabled_field'])) { |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | print '<table class="border centpercent tableforfield">'; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $key = $mode_key . '_' . $field_key; |
|
| 97 | + $key = $mode_key.'_'.$field_key; |
|
| 98 | 98 | $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key]; |
| 99 | 99 | |
| 100 | - print '<tr class="field_' . $key . '"><td'; |
|
| 101 | - print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key; |
|
| 100 | + print '<tr class="field_'.$key.'"><td'; |
|
| 101 | + print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key; |
|
| 102 | 102 | if ($field_info['type'] == 'text' || $field_info['type'] == 'html') { |
| 103 | 103 | print ' tdtop'; |
| 104 | 104 | } |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | print '</td>'; |
| 116 | - print '<td class="valuefield fieldname_' . $key; |
|
| 116 | + print '<td class="valuefield fieldname_'.$key; |
|
| 117 | 117 | if ($field_info['type'] == 'text') { |
| 118 | 118 | print ' wordbreak'; |
| 119 | 119 | } |
| 120 | 120 | if (!empty($field_info['cssview'])) { |
| 121 | - print ' ' . $field_info['cssview']; |
|
| 121 | + print ' '.$field_info['cssview']; |
|
| 122 | 122 | } |
| 123 | 123 | print '">'; |
| 124 | 124 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | if ($field_key == 'lang') { |
| 128 | 128 | $langs->load("languages"); |
| 129 | - $labellang = ($value ? $langs->trans('Language_' . $value) : ''); |
|
| 129 | + $labellang = ($value ? $langs->trans('Language_'.$value) : ''); |
|
| 130 | 130 | print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"'); |
| 131 | 131 | print $labellang; |
| 132 | 132 | } else { |
| 133 | 133 | if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) { |
| 134 | - $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 134 | + $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 135 | 135 | print showValueWithClipboardCPButton($out, 0, $out); |
| 136 | 136 | } else { |
| 137 | - print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 137 | + print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -80,32 +80,32 @@ discard block |
||
| 80 | 80 | $h = 0; |
| 81 | 81 | $head = array(); |
| 82 | 82 | |
| 83 | - $head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id; |
|
| 83 | + $head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id; |
|
| 84 | 84 | $head[$h][1] = $langs->trans("Card"); |
| 85 | 85 | $head[$h][2] = 'card'; |
| 86 | 86 | $h++; |
| 87 | 87 | |
| 88 | 88 | if (empty($object->not_depreciated)) { |
| 89 | - $head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id; |
|
| 89 | + $head[$h][0] = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.$object->id; |
|
| 90 | 90 | $head[$h][1] = $langs->trans("AssetDepreciationOptions"); |
| 91 | 91 | $head[$h][2] = 'depreciation_options'; |
| 92 | 92 | $h++; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - $head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id; |
|
| 95 | + $head[$h][0] = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.$object->id; |
|
| 96 | 96 | $head[$h][1] = $langs->trans("AssetAccountancyCodes"); |
| 97 | 97 | $head[$h][2] = 'accountancy_codes'; |
| 98 | 98 | $h++; |
| 99 | 99 | |
| 100 | 100 | if (empty($object->not_depreciated)) { |
| 101 | - $head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id; |
|
| 101 | + $head[$h][0] = DOL_URL_ROOT.'/asset/depreciation.php?id='.$object->id; |
|
| 102 | 102 | $head[$h][1] = $langs->trans("AssetDepreciation"); |
| 103 | 103 | $head[$h][2] = 'depreciation'; |
| 104 | 104 | $h++; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if (isset($object->disposal_date) && $object->disposal_date !== "") { |
| 108 | - $head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id; |
|
| 108 | + $head[$h][0] = DOL_URL_ROOT.'/asset/disposal.php?id='.$object->id; |
|
| 109 | 109 | $head[$h][1] = $langs->trans("AssetDisposal"); |
| 110 | 110 | $head[$h][2] = 'disposal'; |
| 111 | 111 | $h++; |
@@ -119,29 +119,29 @@ discard block |
||
| 119 | 119 | if (!empty($object->note_public)) { |
| 120 | 120 | $nbNote++; |
| 121 | 121 | } |
| 122 | - $head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id; |
|
| 122 | + $head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id; |
|
| 123 | 123 | $head[$h][1] = $langs->trans('Notes'); |
| 124 | 124 | if ($nbNote > 0) { |
| 125 | - $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : ''); |
|
| 125 | + $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : ''); |
|
| 126 | 126 | } |
| 127 | 127 | $head[$h][2] = 'note'; |
| 128 | 128 | $h++; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; |
|
| 132 | - require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php'; |
|
| 133 | - $upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref); |
|
| 131 | + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
|
| 132 | + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; |
|
| 133 | + $upload_dir = $conf->asset->dir_output."/asset/".dol_sanitizeFileName($object->ref); |
|
| 134 | 134 | $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); |
| 135 | 135 | $nbLinks = Link::count($db, $object->element, $object->id); |
| 136 | - $head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id; |
|
| 136 | + $head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id; |
|
| 137 | 137 | $head[$h][1] = $langs->trans('Documents'); |
| 138 | 138 | if (($nbFiles + $nbLinks) > 0) { |
| 139 | - $head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>'; |
|
| 139 | + $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>'; |
|
| 140 | 140 | } |
| 141 | 141 | $head[$h][2] = 'document'; |
| 142 | 142 | $h++; |
| 143 | 143 | |
| 144 | - $head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id; |
|
| 144 | + $head[$h][0] = DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id; |
|
| 145 | 145 | $head[$h][1] = $langs->trans("Events"); |
| 146 | 146 | $head[$h][2] = 'agenda'; |
| 147 | 147 | $h++; |
@@ -176,17 +176,17 @@ discard block |
||
| 176 | 176 | $h = 0; |
| 177 | 177 | $head = array(); |
| 178 | 178 | |
| 179 | - $head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id; |
|
| 179 | + $head[$h][0] = DOL_URL_ROOT.'/asset/model/card.php?id='.$object->id; |
|
| 180 | 180 | $head[$h][1] = $langs->trans("Card"); |
| 181 | 181 | $head[$h][2] = 'card'; |
| 182 | 182 | $h++; |
| 183 | 183 | |
| 184 | - $head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id; |
|
| 184 | + $head[$h][0] = DOL_URL_ROOT.'/asset/model/depreciation_options.php?id='.$object->id; |
|
| 185 | 185 | $head[$h][1] = $langs->trans("AssetDepreciationOptions"); |
| 186 | 186 | $head[$h][2] = 'depreciation_options'; |
| 187 | 187 | $h++; |
| 188 | 188 | |
| 189 | - $head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id; |
|
| 189 | + $head[$h][0] = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.$object->id; |
|
| 190 | 190 | $head[$h][1] = $langs->trans("AssetAccountancyCodes"); |
| 191 | 191 | $head[$h][2] = 'accountancy_codes'; |
| 192 | 192 | $h++; |
@@ -199,16 +199,16 @@ discard block |
||
| 199 | 199 | if (!empty($object->note_public)) { |
| 200 | 200 | $nbNote++; |
| 201 | 201 | } |
| 202 | - $head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id; |
|
| 202 | + $head[$h][0] = DOL_URL_ROOT.'/asset/model/note.php?id='.$object->id; |
|
| 203 | 203 | $head[$h][1] = $langs->trans('Notes'); |
| 204 | 204 | if ($nbNote > 0) { |
| 205 | - $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : ''); |
|
| 205 | + $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : ''); |
|
| 206 | 206 | } |
| 207 | 207 | $head[$h][2] = 'note'; |
| 208 | 208 | $h++; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - $head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id; |
|
| 211 | + $head[$h][0] = DOL_URL_ROOT.'/asset/model/agenda.php?id='.$object->id; |
|
| 212 | 212 | $head[$h][1] = $langs->trans("Events"); |
| 213 | 213 | $head[$h][2] = 'agenda'; |
| 214 | 214 | $h++; |
@@ -397,9 +397,15 @@ |
||
| 397 | 397 | ) { |
| 398 | 398 | $accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY; |
| 399 | 399 | $filters = array(); |
| 400 | - if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'"; |
|
| 401 | - if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'"; |
|
| 402 | - if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'"; |
|
| 400 | + if (!empty($product_static->accountancy_code_buy)) { |
|
| 401 | + $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'"; |
|
| 402 | + } |
|
| 403 | + if (!empty($product_static->accountancy_code_buy_intra)) { |
|
| 404 | + $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'"; |
|
| 405 | + } |
|
| 406 | + if (!empty($product_static->accountancy_code_buy_export)) { |
|
| 407 | + $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'"; |
|
| 408 | + } |
|
| 403 | 409 | $sql = "SELECT COUNT(*) AS found"; |
| 404 | 410 | $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account"; |
| 405 | 411 | $sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'"; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $discount = new DiscountAbsolute($this->db); |
| 111 | 111 | $discount->fetch($line->fk_remise_except); |
| 112 | 112 | print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0)); |
| 113 | - } elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) { |
|
| 113 | + } elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) { |
|
| 114 | 114 | include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; |
| 115 | 115 | $discount = new DiscountAbsolute($this->db); |
| 116 | 116 | $discount->fetch($line->fk_remise_except); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) { |
| 120 | 120 | print ' ('.dol_print_date($discount->datec).')'; |
| 121 | 121 | } |
| 122 | - } elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) { |
|
| 122 | + } elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) { |
|
| 123 | 123 | include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; |
| 124 | 124 | $discount = new DiscountAbsolute($this->db); |
| 125 | 125 | $discount->fetch($line->fk_remise_except); |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | // we need to fetch product associated to line for some test |
| 194 | 194 | if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') { |
| 195 | 195 | $res = $line->fetch_product(); |
| 196 | - if ($res > 0 ) { |
|
| 196 | + if ($res > 0) { |
|
| 197 | 197 | if ($line->product->isService() && $line->product->isMandatoryPeriod()) { |
| 198 | 198 | print '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSet").'</span></div>'; |
| 199 | 199 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | if ($mysoc->useLocalTax(2)) { |
| 288 | - if (( isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) { |
|
| 288 | + if ((isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) { |
|
| 289 | 289 | $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->total_localtax2); |
| 290 | 290 | } else { |
| 291 | 291 | $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'=<span class="opacitymedium">'.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").'</span>'; |
@@ -431,20 +431,20 @@ discard block |
||
| 431 | 431 | ) { |
| 432 | 432 | $accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY; |
| 433 | 433 | $filters = array(); |
| 434 | - if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'"; |
|
| 435 | - if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'"; |
|
| 436 | - if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'"; |
|
| 434 | + if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy)."'"; |
|
| 435 | + if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy_intra)."'"; |
|
| 436 | + if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy_export)."'"; |
|
| 437 | 437 | $sql = "SELECT COUNT(*) AS found"; |
| 438 | - $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account"; |
|
| 439 | - $sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'"; |
|
| 440 | - $sql .= " AND (" . implode(' OR ', $filters). ")"; |
|
| 438 | + $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account"; |
|
| 439 | + $sql .= " WHERE pcg_type = '".$this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY)."'"; |
|
| 440 | + $sql .= " AND (".implode(' OR ', $filters).")"; |
|
| 441 | 441 | $resql_asset = $this->db->query($sql); |
| 442 | 442 | if (!$resql_asset) { |
| 443 | - print 'Error SQL: ' . $this->db->lasterror(); |
|
| 443 | + print 'Error SQL: '.$this->db->lasterror(); |
|
| 444 | 444 | } elseif ($obj = $this->db->fetch_object($resql_asset)) { |
| 445 | 445 | if (!empty($obj->found)) { |
| 446 | - print '<a class="reposition" href="' . DOL_URL_ROOT . '/asset/card.php?action=create&token='.newToken().'&supplier_invoice_id='.$object->id.'">'; |
|
| 447 | - print img_edit_add() . '</a>'; |
|
| 446 | + print '<a class="reposition" href="'.DOL_URL_ROOT.'/asset/card.php?action=create&token='.newToken().'&supplier_invoice_id='.$object->id.'">'; |
|
| 447 | + print img_edit_add().'</a>'; |
|
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | } |
@@ -349,8 +349,9 @@ discard block |
||
| 349 | 349 | |
| 350 | 350 | $rang = $i; |
| 351 | 351 | //there may already be rows from previous receptions |
| 352 | - if (!empty($createbills_onebythird)) |
|
| 353 | - $rang = $TFactThirdNbLines[$rcp->socid]; |
|
| 352 | + if (!empty($createbills_onebythird)) { |
|
| 353 | + $rang = $TFactThirdNbLines[$rcp->socid]; |
|
| 354 | + } |
|
| 354 | 355 | |
| 355 | 356 | $result = $objecttmp->addline( |
| 356 | 357 | $desc, |
@@ -380,8 +381,10 @@ discard block |
||
| 380 | 381 | |
| 381 | 382 | if ($result > 0) { |
| 382 | 383 | $lineid = $result; |
| 383 | - if (!empty($createbills_onebythird)) //increment rang to keep order |
|
| 384 | + if (!empty($createbills_onebythird)) { |
|
| 385 | + //increment rang to keep order |
|
| 384 | 386 | $TFactThirdNbLines[$rcp->socid]++; |
| 387 | + } |
|
| 385 | 388 | } else { |
| 386 | 389 | $lineid = 0; |
| 387 | 390 | $error++; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int'); |
| 60 | 60 | $search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int'); |
| 61 | 61 | $search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int'); |
| 62 | -$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
| 62 | +$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver |
|
| 63 | 63 | $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear); |
| 64 | 64 | $search_date_create_startday = GETPOST('search_date_create_startday', 'int'); |
| 65 | 65 | $search_date_create_startmonth = GETPOST('search_date_create_startmonth', 'int'); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $search_date_create_endday = GETPOST('search_date_create_endday', 'int'); |
| 68 | 68 | $search_date_create_endmonth = GETPOST('search_date_create_endmonth', 'int'); |
| 69 | 69 | $search_date_create_endyear = GETPOST('search_date_create_endyear', 'int'); |
| 70 | -$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
| 70 | +$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver |
|
| 71 | 71 | $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear); |
| 72 | 72 | $search_billed = GETPOST("search_billed", 'int'); |
| 73 | 73 | $sall = GETPOST('sall', 'alphanohtml'); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $TFactThirdNbLines = array(); |
| 222 | 222 | |
| 223 | 223 | $nb_bills_created = 0; |
| 224 | - $lastid= 0; |
|
| 224 | + $lastid = 0; |
|
| 225 | 225 | $lastref = ''; |
| 226 | 226 | |
| 227 | 227 | $db->begin(); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | // if the VAT reverse-charge is activated by default in supplier card to resume the information |
| 350 | 350 | $objecttmp->vat_reverse_charge = $soc->vat_reverse_charge; |
| 351 | 351 | |
| 352 | - $objecttmp->fk_project = $rcp->fk_project; |
|
| 352 | + $objecttmp->fk_project = $rcp->fk_project; |
|
| 353 | 353 | //$objecttmp->multicurrency_code = $rcp->multicurrency_code; |
| 354 | 354 | if (empty($createbills_onebythird)) { |
| 355 | 355 | $objecttmp->ref_supplier = $rcp->ref; |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | |
| 385 | - $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
| 385 | + $res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id |
|
| 386 | 386 | |
| 387 | 387 | //var_dump($objecttmp->error);exit; |
| 388 | 388 | if ($res > 0) { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | |
| 556 | 556 | $id = $objecttmp->id; // For builddoc action |
| 557 | 557 | $lastref = $objecttmp->ref; // generated ref |
| 558 | - $object =$objecttmp; |
|
| 558 | + $object = $objecttmp; |
|
| 559 | 559 | |
| 560 | 560 | // Fac builddoc |
| 561 | 561 | $donotredirect = 1; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '<div class="fichecenter">'; |
| 68 | 68 | print '<div class="fichehalfleft">'; |
| 69 | 69 | print '<div class="underbanner clearboth"></div>'; |
| 70 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 70 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 71 | 71 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 72 | 72 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 73 | 73 | if (!empty($field_info['enabled_field'])) { |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | print '<table class="border centpercent tableforfield">'; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - $key = $mode_key . '_' . $field_key; |
|
| 97 | + $key = $mode_key.'_'.$field_key; |
|
| 98 | 98 | $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key]; |
| 99 | 99 | |
| 100 | - print '<tr class="field_' . $key . '"><td'; |
|
| 101 | - print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key; |
|
| 100 | + print '<tr class="field_'.$key.'"><td'; |
|
| 101 | + print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key; |
|
| 102 | 102 | if ($field_info['type'] == 'text' || $field_info['type'] == 'html') { |
| 103 | 103 | print ' tdtop'; |
| 104 | 104 | } |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | print '</td>'; |
| 116 | - print '<td class="valuefield fieldname_' . $key; |
|
| 116 | + print '<td class="valuefield fieldname_'.$key; |
|
| 117 | 117 | if ($field_info['type'] == 'text') { |
| 118 | 118 | print ' wordbreak'; |
| 119 | 119 | } |
| 120 | 120 | if (!empty($field_info['cssview'])) { |
| 121 | - print ' ' . $field_info['cssview']; |
|
| 121 | + print ' '.$field_info['cssview']; |
|
| 122 | 122 | } |
| 123 | 123 | print '">'; |
| 124 | 124 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | if ($field_key == 'lang') { |
| 128 | 128 | $langs->load("languages"); |
| 129 | - $labellang = ($value ? $langs->trans('Language_' . $value) : ''); |
|
| 129 | + $labellang = ($value ? $langs->trans('Language_'.$value) : ''); |
|
| 130 | 130 | print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"'); |
| 131 | 131 | print $labellang; |
| 132 | 132 | } else { |
| 133 | 133 | if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) { |
| 134 | - $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 134 | + $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 135 | 135 | print showValueWithClipboardCPButton($out, 0, $out); |
| 136 | 136 | } else { |
| 137 | - print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0); |
|
| 137 | + print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | if (in_array($field_info['type'], array('text', 'html'))) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $amount = $credit; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - return "'" . $this->db->escape(abs($amount)) . "'"; |
|
| 109 | + return "'".$this->db->escape(abs($amount))."'"; |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | return "''"; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $sens = 'C'; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - return "'" . $this->db->escape($sens) . "'"; |
|
| 137 | + return "'".$this->db->escape($sens)."'"; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | return "''"; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | case 'sellist': |
| 49 | 49 | $tmp = ''; |
| 50 | 50 | $tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null |
| 51 | - if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 51 | + if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
| 52 | 52 | $tmpkeys = array_keys($tmpparam['options']); |
| 53 | 53 | $tmp = array_shift($tmpkeys); |
| 54 | 54 | } |
@@ -353,7 +353,7 @@ |
||
| 353 | 353 | 'b.montant'=>'rule-computeAmount', |
| 354 | 354 | 'b.sens'=>'rule-computeDirection' |
| 355 | 355 | ); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) |
| 356 | - $this->import_convertvalue_array[$r]=array( |
|
| 356 | + $this->import_convertvalue_array[$r] = array( |
|
| 357 | 357 | 'b.piece_num' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'), |
| 358 | 358 | 'b.numero_compte'=>array('rule'=>'accountingaccount'), |
| 359 | 359 | 'b.subledger_account'=>array('rule'=>'accountingaccount'), |