@@ -39,8 +39,8 @@ |
||
39 | 39 | |
40 | 40 | $id = GETPOST('id', 'int'); |
41 | 41 | $ref = GETPOST('ref', 'alpha'); |
42 | -$batch = GETPOST('batch', 'alpha'); |
|
43 | -$objectid = GETPOST('productid', 'int'); |
|
42 | +$batch = GETPOST('batch', 'alpha'); |
|
43 | +$objectid = GETPOST('productid', 'int'); |
|
44 | 44 | |
45 | 45 | // Security check |
46 | 46 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -39,8 +39,8 @@ |
||
39 | 39 | |
40 | 40 | $id = GETPOST('id', 'int'); |
41 | 41 | $ref = GETPOST('ref', 'alpha'); |
42 | -$batch = GETPOST('batch', 'alpha'); |
|
43 | -$objectid = GETPOST('productid', 'int'); |
|
42 | +$batch = GETPOST('batch', 'alpha'); |
|
43 | +$objectid = GETPOST('productid', 'int'); |
|
44 | 44 | |
45 | 45 | // Security check |
46 | 46 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -601,9 +601,9 @@ |
||
601 | 601 | |
602 | 602 | |
603 | 603 | $totalarray = array(); |
604 | - $totalarray['val'] = array (); |
|
605 | - $totalarray['pos'] = array (); |
|
606 | - $totalarray['type'] = array (); |
|
604 | + $totalarray['val'] = array(); |
|
605 | + $totalarray['pos'] = array(); |
|
606 | + $totalarray['type'] = array(); |
|
607 | 607 | $totalarray['nbfield'] = 0; |
608 | 608 | |
609 | 609 | // TODO Create $arrayfields with all fields to show |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $search_batch = trim(GETPOST("search_batch")); |
86 | 86 | $search_qty = trim(GETPOST("search_qty")); |
87 | 87 | $search_type_mouvement = GETPOST('search_type_mouvement', 'int'); |
88 | -$search_fk_project=GETPOST("search_fk_project", 'int'); |
|
88 | +$search_fk_project = GETPOST("search_fk_project", 'int'); |
|
89 | 89 | |
90 | 90 | $type = GETPOST("type", "int"); |
91 | 91 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $object = new MouvementStock($db); |
116 | 116 | $extrafields = new ExtraFields($db); |
117 | 117 | $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id; |
118 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
118 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
119 | 119 | |
120 | 120 | $formfile = new FormFile($db); |
121 | 121 | |
@@ -655,10 +655,10 @@ discard block |
||
655 | 655 | $sql .= " AND e.rowid = ".((int) $id); |
656 | 656 | } |
657 | 657 | if (!empty($search_date_start)) { |
658 | - $sql .= " AND m.datem >= '" . $db->idate($search_date_start) . "'"; |
|
658 | + $sql .= " AND m.datem >= '".$db->idate($search_date_start)."'"; |
|
659 | 659 | } |
660 | 660 | if (!empty($search_date_end)) { |
661 | - $sql .= " AND m.datem <= '" . $db->idate($search_date_end) . "'"; |
|
661 | + $sql .= " AND m.datem <= '".$db->idate($search_date_end)."'"; |
|
662 | 662 | } |
663 | 663 | if ($idproduct > 0) { |
664 | 664 | $sql .= " AND p.rowid = ".((int) $idproduct); |
@@ -1119,10 +1119,10 @@ discard block |
||
1119 | 1119 | // Date |
1120 | 1120 | print '<td class="liste_titre center">'; |
1121 | 1121 | print '<div class="nowrap">'; |
1122 | - print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel'); |
|
1122 | + print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel'); |
|
1123 | 1123 | print '</div>'; |
1124 | 1124 | print '<div class="nowrap">'; |
1125 | - print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel'); |
|
1125 | + print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel'); |
|
1126 | 1126 | print '</div>'; |
1127 | 1127 | print '</td>'; |
1128 | 1128 | } |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | |
38 | 38 | $langs->loadLangs(array('companies', 'contracts', 'tickets')); |
39 | 39 | |
40 | -$socid=GETPOST('socid', 'int'); |
|
41 | -$id=GETPOST('id', 'int'); |
|
42 | -$ref=GETPOST('ref', 'alpha'); |
|
43 | -$action=GETPOST('action', 'alpha'); |
|
40 | +$socid = GETPOST('socid', 'int'); |
|
41 | +$id = GETPOST('id', 'int'); |
|
42 | +$ref = GETPOST('ref', 'alpha'); |
|
43 | +$action = GETPOST('action', 'alpha'); |
|
44 | 44 | |
45 | 45 | if ($id == '' && $ref == '') { |
46 | 46 | dol_print_error('', 'Bad parameter'); |
@@ -48,11 +48,11 @@ discard block |
||
48 | 48 | } |
49 | 49 | |
50 | 50 | // Security check |
51 | -$socid=0; |
|
51 | +$socid = 0; |
|
52 | 52 | if ($user->socid > 0) |
53 | - $socid=$user->socid; |
|
53 | + $socid = $user->socid; |
|
54 | 54 | |
55 | -$result=restrictedArea($user, 'contrat', $id); |
|
55 | +$result = restrictedArea($user, 'contrat', $id); |
|
56 | 56 | |
57 | 57 | |
58 | 58 | /* |
@@ -62,62 +62,62 @@ discard block |
||
62 | 62 | llxHeader("", $langs->trans("Tickets"), "Contrat"); |
63 | 63 | |
64 | 64 | $form = new Form($db); |
65 | -$userstatic=new User($db); |
|
65 | +$userstatic = new User($db); |
|
66 | 66 | |
67 | -$object= new Contrat($db); |
|
68 | -$result=$object->fetch($id, $ref); |
|
69 | -$ret=$object->fetch_thirdparty(); |
|
67 | +$object = new Contrat($db); |
|
68 | +$result = $object->fetch($id, $ref); |
|
69 | +$ret = $object->fetch_thirdparty(); |
|
70 | 70 | $head = contract_prepare_head($object); |
71 | 71 | |
72 | 72 | |
73 | 73 | dol_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract'); |
74 | 74 | |
75 | -$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'; |
|
76 | -$linkback.= $langs->trans("BackToList").'</a>'; |
|
75 | +$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'; |
|
76 | +$linkback .= $langs->trans("BackToList").'</a>'; |
|
77 | 77 | |
78 | -$morehtmlref=''; |
|
79 | -$morehtmlref.=$object->ref; |
|
78 | +$morehtmlref = ''; |
|
79 | +$morehtmlref .= $object->ref; |
|
80 | 80 | |
81 | -$morehtmlref.='<div class="refidno">'; |
|
81 | +$morehtmlref .= '<div class="refidno">'; |
|
82 | 82 | // Ref customer |
83 | -$morehtmlref.=$form->editfieldkey( |
|
83 | +$morehtmlref .= $form->editfieldkey( |
|
84 | 84 | "RefCustomer", 'ref_customer', $object->ref_customer, |
85 | 85 | $object, 0, 'string', '', 0, 1 |
86 | 86 | ); |
87 | -$morehtmlref.=$form->editfieldval( |
|
87 | +$morehtmlref .= $form->editfieldval( |
|
88 | 88 | "RefCustomer", 'ref_customer', $object->ref_customer, |
89 | 89 | $object, 0, 'string', '', null, null, '', 1 |
90 | 90 | ); |
91 | 91 | // Ref supplier |
92 | -$morehtmlref.='<br>'; |
|
93 | -$morehtmlref.=$form->editfieldkey( |
|
92 | +$morehtmlref .= '<br>'; |
|
93 | +$morehtmlref .= $form->editfieldkey( |
|
94 | 94 | "RefSupplier", 'ref_supplier', $object->ref_supplier, |
95 | 95 | $object, 0, 'string', '', 0, 1 |
96 | 96 | ); |
97 | -$morehtmlref.=$form->editfieldval( |
|
97 | +$morehtmlref .= $form->editfieldval( |
|
98 | 98 | "RefSupplier", 'ref_supplier', $object->ref_supplier, |
99 | 99 | $object, 0, 'string', '', null, null, '', 1 |
100 | 100 | ); |
101 | 101 | // Thirdparty |
102 | -$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1); |
|
102 | +$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1); |
|
103 | 103 | // Project |
104 | -if (! empty($conf->projet->enabled)) { |
|
104 | +if (!empty($conf->projet->enabled)) { |
|
105 | 105 | require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; |
106 | 106 | |
107 | 107 | $langs->load("projects"); |
108 | - $morehtmlref.='<br>'.$langs->trans('Project') . ' : '; |
|
109 | - if (! empty($object->fk_project)) { |
|
108 | + $morehtmlref .= '<br>'.$langs->trans('Project').' : '; |
|
109 | + if (!empty($object->fk_project)) { |
|
110 | 110 | $proj = new Project($db); |
111 | 111 | $proj->fetch($object->fk_project); |
112 | - $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id='; |
|
113 | - $morehtmlref.=$object->fk_project . '" title="' . $langs->trans('ShowProject') . '">'; |
|
114 | - $morehtmlref.=$proj->ref; |
|
115 | - $morehtmlref.='</a>'; |
|
112 | + $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='; |
|
113 | + $morehtmlref .= $object->fk_project.'" title="'.$langs->trans('ShowProject').'">'; |
|
114 | + $morehtmlref .= $proj->ref; |
|
115 | + $morehtmlref .= '</a>'; |
|
116 | 116 | } else { |
117 | - $morehtmlref.=''; |
|
117 | + $morehtmlref .= ''; |
|
118 | 118 | } |
119 | 119 | } |
120 | -$morehtmlref.='</div>'; |
|
120 | +$morehtmlref .= '</div>'; |
|
121 | 121 | |
122 | 122 | dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref); |
123 | 123 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * Referers types |
129 | 129 | */ |
130 | 130 | |
131 | -$title=$langs->trans("ListTicketsLinkToContract"); |
|
131 | +$title = $langs->trans("ListTicketsLinkToContract"); |
|
132 | 132 | |
133 | 133 | print '<table class="noborder" width="100%">'; |
134 | 134 | print '<tr class="liste_titre">'; |
@@ -1155,7 +1155,7 @@ discard block |
||
1155 | 1155 | $result = 'found'; // If error, we force like if we found to avoid any deletion |
1156 | 1156 | } |
1157 | 1157 | } else { |
1158 | - $result = 'found'; // |
|
1158 | + $result = 'found'; // |
|
1159 | 1159 | } |
1160 | 1160 | |
1161 | 1161 | if (!$result) { |
@@ -1525,16 +1525,16 @@ discard block |
||
1525 | 1525 | |
1526 | 1526 | // Repair llx_commande_fournisseur to eleminate duplicate reference |
1527 | 1527 | if ($ok && GETPOST('repair_supplier_order_duplicate_ref')) { |
1528 | - require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php'; |
|
1529 | - include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; |
|
1528 | + require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; |
|
1529 | + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
|
1530 | 1530 | |
1531 | 1531 | $db->begin(); |
1532 | 1532 | |
1533 | 1533 | $err = 0; |
1534 | 1534 | |
1535 | 1535 | // Query to find all duplicate supplier orders |
1536 | - $sql = "SELECT * FROM " . MAIN_DB_PREFIX . "commande_fournisseur"; |
|
1537 | - $sql .= " WHERE ref IN (SELECT cf.ref FROM " . MAIN_DB_PREFIX . "commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)"; |
|
1536 | + $sql = "SELECT * FROM ".MAIN_DB_PREFIX."commande_fournisseur"; |
|
1537 | + $sql .= " WHERE ref IN (SELECT cf.ref FROM ".MAIN_DB_PREFIX."commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)"; |
|
1538 | 1538 | |
1539 | 1539 | // Build a list of ref => []CommandeFournisseur |
1540 | 1540 | $duplicateSupplierOrders = []; |
@@ -1560,7 +1560,7 @@ discard block |
||
1560 | 1560 | |
1561 | 1561 | $newRef = $supplierOrder->getNextNumRef($soc); |
1562 | 1562 | |
1563 | - $sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int) $supplierOrder->id; |
|
1563 | + $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur cf SET cf.ref = '".$db->escape($newRef)."' WHERE cf.rowid = ".(int) $supplierOrder->id; |
|
1564 | 1564 | if (!$db->query($sql)) { |
1565 | 1565 | $err++; |
1566 | 1566 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | -$websitekey=basename(__DIR__); |
|
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
2 | +$websitekey = basename(__DIR__); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
6 | 6 | ob_start(); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
4 | + if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
5 | 5 | require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php'; |
6 | 6 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | -$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__; |
|
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
2 | +$websitekey = basename(__DIR__); if (empty($websitepagefile)) $websitepagefile = __FILE__; |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
4 | 4 | $pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2; |
5 | 5 | require_once $pathdepth ? str_repeat('../', $pathdepth) : './'.'master.inc.php'; |
6 | 6 | } // Not already loaded |