@@ -44,7 +44,7 @@ |
||
44 | 44 | $object = new Dolresource($db); |
45 | 45 | |
46 | 46 | // Load object |
47 | -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once |
|
47 | +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once |
|
48 | 48 | |
49 | 49 | // Security check |
50 | 50 | if ($user->socid) { |
@@ -537,8 +537,8 @@ |
||
537 | 537 | // Ref customer |
538 | 538 | //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, $user->rights->ficheinter->creer, 'string', '', 0, 1); |
539 | 539 | //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1); |
540 | - $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', 0, 1); |
|
541 | - $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', null, null, '', 1); |
|
540 | + $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', 0, 1); |
|
541 | + $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $fichinter->ref_client, $fichinter, 0, 'string', '', null, null, '', 1); |
|
542 | 542 | // Thirdparty |
543 | 543 | $morehtmlref .= '<br>'.$fichinter->thirdparty->getNomUrl(1, 'customer'); |
544 | 544 | // Project |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | $websitekey = ''; |
102 | 102 | |
103 | -$permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
103 | +$permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
104 | 104 | |
105 | 105 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
106 | 106 | $hookmanager->initHooks(array('ecmmediascard', 'globalcard')); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if ($sortorder) { |
118 | 118 | $backtopage .= '&sortorder='.urlencode($sortorder); |
119 | 119 | } |
120 | -include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
120 | +include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file. |
|
121 | 121 | |
122 | 122 | $backtopage = $savbacktopage; |
123 | 123 |
@@ -161,16 +161,16 @@ discard block |
||
161 | 161 | 'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"contains hash of file content"), |
162 | 162 | 'share' => array('type'=>'varchar(128)', 'label'=>'Share', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "contains hash for file sharing"), |
163 | 163 | 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1), |
164 | - 'filepath' => array('type'=>'varchar(255)', 'label'=>'FilePath', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "relative to dolibarr document dir. Example module/def"), |
|
165 | - 'filename' => array('type'=>'varchar(255)', 'label'=>'FileName', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"file name only without any directory"), |
|
166 | - 'src_object_type' => array('type'=>'varchar(64)', 'label'=>'SourceType', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>0, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "Source object type ('proposal', 'invoice', ...)"), |
|
164 | + 'filepath' => array('type'=>'varchar(255)', 'label'=>'FilePath', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=> "relative to dolibarr document dir. Example module/def"), |
|
165 | + 'filename' => array('type'=>'varchar(255)', 'label'=>'FileName', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"file name only without any directory"), |
|
166 | + 'src_object_type' => array('type'=>'varchar(64)', 'label'=>'SourceType', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>0, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=> "Source object type ('proposal', 'invoice', ...)"), |
|
167 | 167 | 'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"), |
168 | - 'fullpath_orig' => array('type'=>'varchar(750)', 'label'=>'FullPathOrig', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"full path of original filename, when file is uploaded from a local computer"), |
|
168 | + 'fullpath_orig' => array('type'=>'varchar(750)', 'label'=>'FullPathOrig', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"full path of original filename, when file is uploaded from a local computer"), |
|
169 | 169 | 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110), |
170 | - 'keywords' => array('type'=>'varchar(750)', 'label'=>'Keywords', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"list of keywords, separated with comma. Must be limited to most important keywords."), |
|
170 | + 'keywords' => array('type'=>'varchar(750)', 'label'=>'Keywords', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"list of keywords, separated with comma. Must be limited to most important keywords."), |
|
171 | 171 | 'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment'=>"is this file a file to use for a cover"), |
172 | 172 | 'position' => array('type' => 'integer', 'label' => 'Position', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"), |
173 | - 'gen_or_uploaded' => array('type'=>'varchar(12)', 'label'=>'GenOrUpload', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"'generated' or 'uploaded'"), |
|
173 | + 'gen_or_uploaded' => array('type'=>'varchar(12)', 'label'=>'GenOrUpload', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"'generated' or 'uploaded'"), |
|
174 | 174 | 'extraparams' => array('type'=>'varchar(255)', 'label'=>'ExtraParams', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "for stocking other parameters with json format"), |
175 | 175 | 'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170), |
176 | 176 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175), |
@@ -906,7 +906,7 @@ discard block |
||
906 | 906 | $result .= $linkstart.$this->ref.$linkend; |
907 | 907 | |
908 | 908 | global $action; |
909 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
909 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
910 | 910 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
911 | 911 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
912 | 912 | if ($reshook > 0) { |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | print '<table class="noborder centpercent">'; |
680 | 680 | print '<tr class="liste_titre"><td>'; |
681 | 681 | print $langs->trans("AddSupplierIntoCategory").' '; |
682 | - $filter ='(s.fournisseur:=:1)'; |
|
682 | + $filter = '(s.fournisseur:=:1)'; |
|
683 | 683 | print $form->select_company('', 'elemid', $filter); |
684 | 684 | print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>'; |
685 | 685 | print '</tr>'; |
@@ -1114,7 +1114,7 @@ discard block |
||
1114 | 1114 | print '<input type="hidden" name="action" value="addintocategory">'; |
1115 | 1115 | print '<table class="noborder centpercent">'; |
1116 | 1116 | print '<tr class="liste_titre"><td>'; |
1117 | - $force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg() |
|
1117 | + $force_entity = getEntity($object->element); // So we will get same filter than the getObjectsInCateg() |
|
1118 | 1118 | print img_picto('', $type, 'class="pictofixedwidth"'); |
1119 | 1119 | print $form->select_dolusers('', 'elemid', 1, null, 0, '', '', $force_entity); |
1120 | 1120 | print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>'; |
@@ -179,9 +179,9 @@ |
||
179 | 179 | public $max_total_amount_of_all_payments; |
180 | 180 | public $preapproval_key; |
181 | 181 | public $total_amount_of_all_payments; |
182 | - public $stripe_card_ref; // External system payment mode ID |
|
183 | - public $stripe_account; // External system customer ID |
|
184 | - public $ext_payment_site; // External system 'StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ... |
|
182 | + public $stripe_card_ref; // External system payment mode ID |
|
183 | + public $stripe_account; // External system customer ID |
|
184 | + public $ext_payment_site; // External system 'StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ... |
|
185 | 185 | |
186 | 186 | /** |
187 | 187 | * @var int Status |
@@ -280,7 +280,7 @@ |
||
280 | 280 | |
281 | 281 | // Type |
282 | 282 | $membertypestatic->id = $objp->type_id; |
283 | - $membertypestatic->libelle = $objp->type_label; // deprecated |
|
283 | + $membertypestatic->libelle = $objp->type_label; // deprecated |
|
284 | 284 | $membertypestatic->label = $objp->type_label; |
285 | 285 | |
286 | 286 | print '<td class="nowrap">'; |
@@ -82,7 +82,7 @@ |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | // Generate list of companies |
85 | -if (! $socid) { |
|
85 | +if (!$socid) { |
|
86 | 86 | echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter')); |
87 | 87 | exit; |
88 | 88 | } |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | $action = GETPOST('action', 'aZ09'); |
37 | 37 | $value = GETPOST('value', 'alpha'); |
38 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
38 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
39 | 39 | |
40 | 40 | if (!$user->admin) { |
41 | 41 | accessforbidden(); |