@@ -28,31 +28,31 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | function zapierAdminPrepareHead() |
| 30 | 30 | { |
| 31 | - global $langs, $conf; |
|
| 31 | + global $langs, $conf; |
|
| 32 | 32 | |
| 33 | - $langs->load("zapier@zapier"); |
|
| 33 | + $langs->load("zapier@zapier"); |
|
| 34 | 34 | |
| 35 | - $h = 0; |
|
| 36 | - $head = array(); |
|
| 35 | + $h = 0; |
|
| 36 | + $head = array(); |
|
| 37 | 37 | |
| 38 | - $head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1); |
|
| 39 | - $head[$h][1] = $langs->trans("Settings"); |
|
| 40 | - $head[$h][2] = 'settings'; |
|
| 41 | - $h++; |
|
| 42 | - $head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1); |
|
| 43 | - $head[$h][1] = $langs->trans("About"); |
|
| 44 | - $head[$h][2] = 'about'; |
|
| 45 | - $h++; |
|
| 38 | + $head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1); |
|
| 39 | + $head[$h][1] = $langs->trans("Settings"); |
|
| 40 | + $head[$h][2] = 'settings'; |
|
| 41 | + $h++; |
|
| 42 | + $head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1); |
|
| 43 | + $head[$h][1] = $langs->trans("About"); |
|
| 44 | + $head[$h][2] = 'about'; |
|
| 45 | + $h++; |
|
| 46 | 46 | |
| 47 | - // Show more tabs from modules |
|
| 48 | - // Entries must be declared in modules descriptor with line |
|
| 49 | - //$this->tabs = array( |
|
| 50 | - // 'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__' |
|
| 51 | - //); // to add new tab |
|
| 52 | - //$this->tabs = array( |
|
| 53 | - // 'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__' |
|
| 54 | - //); // to remove a tab |
|
| 55 | - complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier'); |
|
| 47 | + // Show more tabs from modules |
|
| 48 | + // Entries must be declared in modules descriptor with line |
|
| 49 | + //$this->tabs = array( |
|
| 50 | + // 'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__' |
|
| 51 | + //); // to add new tab |
|
| 52 | + //$this->tabs = array( |
|
| 53 | + // 'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__' |
|
| 54 | + //); // to remove a tab |
|
| 55 | + complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier'); |
|
| 56 | 56 | |
| 57 | - return $head; |
|
| 57 | + return $head; |
|
| 58 | 58 | } |
@@ -128,9 +128,9 @@ |
||
| 128 | 128 | |
| 129 | 129 | dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); |
| 130 | 130 | |
| 131 | - print '<div class="fichecenter">'; |
|
| 131 | + print '<div class="fichecenter">'; |
|
| 132 | 132 | |
| 133 | - print '<div class="underbanner clearboth"></div>'; |
|
| 133 | + print '<div class="underbanner clearboth"></div>'; |
|
| 134 | 134 | print '<table class="border centpercent">'; |
| 135 | 135 | |
| 136 | 136 | // Number of files |
@@ -163,7 +163,7 @@ |
||
| 163 | 163 | // Add logic to show/hide buttons |
| 164 | 164 | if ($conf->use_javascript_ajax) |
| 165 | 165 | { |
| 166 | - ?> |
|
| 166 | + ?> |
|
| 167 | 167 | <script type="text/javascript"> |
| 168 | 168 | jQuery(document).ready(function() { |
| 169 | 169 | jQuery("#updateconst").hide(); |
@@ -2,9 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement)) |
| 4 | 4 | { |
| 5 | - //print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement; |
|
| 6 | - dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set'); |
|
| 7 | - exit; |
|
| 5 | + //print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement; |
|
| 6 | + dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set'); |
|
| 7 | + exit; |
|
| 8 | 8 | } |
| 9 | 9 | if (empty($keyforalias)) $keyforalias = 't'; |
| 10 | 10 | |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | <td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td> |
| 115 | 115 | </tr> |
| 116 | 116 | <?php |
| 117 | - } |
|
| 117 | + } |
|
| 118 | 118 | } |
| 119 | 119 | ?> |
| 120 | 120 | |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) { |
|
| 39 | - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); |
|
| 40 | - } else { |
|
| 41 | - setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); |
|
| 42 | - } |
|
| 38 | + if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) { |
|
| 39 | + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); |
|
| 40 | + } else { |
|
| 41 | + setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); |
|
| 42 | + } |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | $title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes'); |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'</td></tr>'; |
| 61 | 61 | print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>'; |
| 62 | 62 | if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { |
| 63 | - $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; |
|
| 63 | + $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; |
|
| 64 | 64 | } else { |
| 65 | - $separator = "_"; |
|
| 65 | + $separator = "_"; |
|
| 66 | 66 | } |
| 67 | 67 | print '<td class="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>'; |
| 68 | 68 | print '</table>'; |
@@ -31,18 +31,18 @@ |
||
| 31 | 31 | $id = GETPOST('id', 'int'); |
| 32 | 32 | |
| 33 | 33 | if (!$id) { |
| 34 | - print json_encode(array( |
|
| 35 | - 'error' => 'ID not set' |
|
| 36 | - )); |
|
| 37 | - exit(); |
|
| 34 | + print json_encode(array( |
|
| 35 | + 'error' => 'ID not set' |
|
| 36 | + )); |
|
| 37 | + exit(); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $product = new Product($db); |
| 41 | 41 | |
| 42 | 42 | if ($product->fetch($id) < 0) { |
| 43 | - print json_encode(array( |
|
| 44 | - 'error' => 'Product not found' |
|
| 45 | - )); |
|
| 43 | + print json_encode(array( |
|
| 44 | + 'error' => 'Product not found' |
|
| 45 | + )); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $prodcomb = new ProductCombination($db); |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | |
| 93 | 93 | // Array to add new pages in new tabs |
| 94 | 94 | $this->tabs = array( |
| 95 | - // 'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__' |
|
| 95 | + // 'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__' |
|
| 96 | 96 | ); |
| 97 | 97 | |
| 98 | 98 | // Dictionaries |
@@ -44,27 +44,27 @@ |
||
| 44 | 44 | public $description; |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * Date modification record (tms) |
|
| 48 | - * |
|
| 49 | - * @var integer |
|
| 50 | - */ |
|
| 47 | + * Date modification record (tms) |
|
| 48 | + * |
|
| 49 | + * @var integer |
|
| 50 | + */ |
|
| 51 | 51 | public $tms; |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | - * Date creation record (datec) |
|
| 55 | - * |
|
| 56 | - * @var integer |
|
| 57 | - */ |
|
| 58 | - public $datec; |
|
| 54 | + * Date creation record (datec) |
|
| 55 | + * |
|
| 56 | + * @var integer |
|
| 57 | + */ |
|
| 58 | + public $datec; |
|
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | - * @var int ID |
|
| 62 | - */ |
|
| 61 | + * @var int ID |
|
| 62 | + */ |
|
| 63 | 63 | public $fk_user_author; |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * @var int ID |
|
| 67 | - */ |
|
| 66 | + * @var int ID |
|
| 67 | + */ |
|
| 68 | 68 | public $fk_user_modif; |
| 69 | 69 | |
| 70 | 70 | /** |