View GitHub Repository dolibarr

Schedule Inspection
Subscribe
Completed
Branch — develop (354a31)
by
unknown
22:20
created
Category
Toggle Patches
dev/initdata/generate-thirdparty.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -105,7 +105,7 @@
 
 block discarded – undo
105 105
106 106 
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
107 107 
 for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
108 
-	print "Company $s\n";
108 
+	print "company $s\n";
109 109 
 	$soc = new Societe($db);
110 110 
 	$soc->name = "Company num ".time()."$s";
111 111 
 	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,7 @@  discard block
 
 block discarded – undo
26 26
27 27 
 $sapi_type = php_sapi_name();
28 28 
 $script_file = basename(__FILE__);
29 
-$path=dirname(__FILE__).'/';
29 
+$path = dirname(__FILE__).'/';
30 30
31 31 
 // Test si mode batch
32 32 
 $sapi_type = php_sapi_name();
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37
38 38 
 // Recupere root dolibarr
39 39 
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
40 
-require __DIR__. '/../../htdocs/master.inc.php';
40 
+require __DIR__.'/../../htdocs/master.inc.php';
41 41 
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42 
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43 
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -45,8 +45,8 @@  discard block
 
 block discarded – undo
45 45 
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
46 46 
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
47 47
48 
-$listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
49 
-$listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
48 
+$listoftown = array("Auray", "Baden", "Vannes", "Pirouville", "Haguenau", "Souffelweiersheim", "Illkirch-Graffenstaden", "Lauterbourg", "Picauville", "Sainte-Mère Eglise", "Le Bono");
49 
+$listoflastname = array("Joe", "Marc", "Steve", "Laurent", "Nico", "Isabelle", "Dorothee", "Saby", "Brigitte", "Karine", "Jose-Anne", "Celine", "Virginie");
50 50
51 51
52 52 
 /*
 
@@ -56,8 +56,8 @@  discard block
 
 block discarded – undo
56 56 
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
57 57
58 58
59 
-$ret=$user->fetch('', 'admin');
60 
-if (! $ret > 0) {
59 
+$ret = $user->fetch('', 'admin');
60 
+if (!$ret > 0) {
61 61 
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
62 62 
 	exit;
63 63 
 }
 
@@ -65,7 +65,7 @@  discard block
 
 block discarded – undo
65 65
66 66
67 67 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
68 
-$resql=$db->query($sql);
68 
+$resql = $db->query($sql);
69 69 
 if ($resql) {
70 70 
 	$num = $db->num_rows($resql);
71 71 
 	$i = 0;
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
 }
78 78
79 79 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
80 
-$resql=$db->query($sql);
80 
+$resql = $db->query($sql);
81 81 
 if ($resql) {
82 82 
 	$num = $db->num_rows($resql);
83 83 
 	$i = 0;
 
@@ -91,7 +91,7 @@  discard block
 
 block discarded – undo
91 91 
 }
92 92
93 93 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
94 
-$resql=$db->query($sql);
94 
+$resql = $db->query($sql);
95 95 
 if ($resql) {
96 96 
 	$num = $db->num_rows($resql);
97 97 
 	$i = 0;
 
@@ -111,18 +111,18 @@  discard block
 
 block discarded – undo
111 111 
 	print "Company $s\n";
112 112 
 	$soc = new Societe($db);
113 113 
 	$soc->name = "Company num ".time()."$s";
114 
-	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
115 
-	$soc->client = mt_rand(1, 2);		// Une societe sur 2 est prospect, l'autre client
116 
-	$soc->fournisseur = mt_rand(0, 1);	// Une societe sur 2 est fournisseur
117 
-	$soc->code_client='CU'.time()."$s";
118 
-	$soc->code_fournisseur='SU'.time()."$s";
119 
-	$soc->tva_assuj=1;
120 
-	$soc->country_id=1;
121 
-	$soc->country_code='FR';
114 
+	$soc->town = $listoftown[mt_rand(0, count($listoftown) - 1)];
115 
+	$soc->client = mt_rand(1, 2); // Une societe sur 2 est prospect, l'autre client
116 
+	$soc->fournisseur = mt_rand(0, 1); // Une societe sur 2 est fournisseur
117 
+	$soc->code_client = 'CU'.time()."$s";
118 
+	$soc->code_fournisseur = 'SU'.time()."$s";
119 
+	$soc->tva_assuj = 1;
120 
+	$soc->country_id = 1;
121 
+	$soc->country_code = 'FR';
122 122 
 	// Un client sur 3 a une remise de 5%
123 
-	$user_remise=mt_rand(1, 3);
124 
-	if ($user_remise==3) {
125 
-		$soc->remise_percent=5;
123 
+	$user_remise = mt_rand(1, 3);
124 
+	if ($user_remise == 3) {
125 
+		$soc->remise_percent = 5;
126 126 
 	}
127 127 
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
128 128 
 	$soc->note_private = 'Company created by the script generate-societe.php';
 
@@ -135,7 +135,7 @@  discard block
 
 block discarded – undo
135 135 
 			$contact = new Contact($db);
136 136 
 			$contact->socid = $soc->id;
137 137 
 			$contact->lastname = "Lastname".$c;
138 
-			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
138 
+			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
139 139 
 			if ($contact->create($user)) {
140 140 
 			}
141 141 
 		}
Please login to merge, or discard this patch.
dev/initdata/generate-product.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -106,7 +106,7 @@
 
 block discarded – undo
106 106 
 	$produit->tva_tx = "20.0";
107 107 
 	$ret=$produit->create($user);
108 108 
 	if ($ret < 0) {
109 
-		print "Error $ret - ".$produit->error."\n";
109 
+		print "error $ret - ".$produit->error."\n";
110 110 
 	} else {
111 111 
 		print " OK with ref ".$produit->ref."\n";
112 112 
 	}
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,7 @@  discard block
 
 block discarded – undo
26 26
27 27 
 $sapi_type = php_sapi_name();
28 28 
 $script_file = basename(__FILE__);
29 
-$path=dirname(__FILE__).'/';
29 
+$path = dirname(__FILE__).'/';
30 30
31 31 
 // Test si mode batch
32 32 
 $sapi_type = php_sapi_name();
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37
38 38 
 // Recupere root dolibarr
39 39 
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
40 
-require __DIR__. '/../../htdocs/master.inc.php';
40 
+require __DIR__.'/../../htdocs/master.inc.php';
41 41 
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42 
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43 
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -53,8 +53,8 @@  discard block
 
 block discarded – undo
53 53 
 define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
54 54
55 55
56 
-$ret=$user->fetch('', 'admin');
57 
-if (! $ret > 0) {
56 
+$ret = $user->fetch('', 'admin');
57 
+if (!$ret > 0) {
58 58 
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
59 59 
 	exit;
60 60 
 }
 
@@ -62,7 +62,7 @@  discard block
 
 block discarded – undo
62 62
63 63
64 64 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
65 
-$resql=$db->query($sql);
65 
+$resql = $db->query($sql);
66 66 
 if ($resql) {
67 67 
 	$num = $db->num_rows($resql);
68 68 
 	$i = 0;
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
 }
75 75
76 76 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
77 
-$resql=$db->query($sql);
77 
+$resql = $db->query($sql);
78 78 
 if ($resql) {
79 79 
 	$num = $db->num_rows($resql);
80 80 
 	$i = 0;
 
@@ -88,7 +88,7 @@  discard block
 
 block discarded – undo
88 88 
 }
89 89
90 90 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
91 
-$resql=$db->query($sql);
91 
+$resql = $db->query($sql);
92 92 
 if ($resql) {
93 93 
 	$num = $db->num_rows($resql);
94 94 
 	$i = 0;
 
@@ -113,7 +113,7 @@  discard block
 
 block discarded – undo
113 113 
 	$produit->description = 'Description '.time().$s;
114 114 
 	$produit->price = mt_rand(1, 999.99);
115 115 
 	$produit->tva_tx = "20.0";
116 
-	$ret=$produit->create($user);
116 
+	$ret = $produit->create($user);
117 117 
 	if ($ret < 0) {
118 118 
 		print "Error $ret - ".$produit->error."\n";
119 119 
 	} else {
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -94,7 +94,7 @@
 
 block discarded – undo
94 94 
 }
95 95 
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
96 96
97 
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');	// Used by the include of actions_dellink.inc.php
97 
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
98 98
99 99
100 100 
 /*
Please login to merge, or discard this patch.
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -134,15 +134,15 @@  discard block
 
 block discarded – undo
134 134
135 135 
 		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
136 136 
 			if ($key == $current_lang) {
137 
-				$object->label = GETPOST("libelle-" . $key);
138 
-				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
139 
-				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
137 
+				$object->label = GETPOST("libelle-".$key);
138 
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
139 
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
140 140
141 141 
 				$object->update($object->id, $user);
142 142 
 			} else {
143 
-				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
144 
-				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
145 
-				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
143 
+				$object->multilangs[$key]["label"] = GETPOST("libelle-".$key);
144 
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
145 
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
146 146 
 			}
147 147 
 		}
148 148 
 
@@ -235,9 +235,9 @@  discard block
 
 block discarded – undo
235 235 
 if (empty($reshook)) {
236 236 
 	if ($action == '') {
237 237 
 		if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
238 
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
238 
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>';
239 239 
 			if ($cnt_trans > 0) {
240 
-				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>';
240 
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
241 241 
 			}
242 242 
 		}
243 243 
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -155,7 +155,7 @@
 
 block discarded – undo
155 155 
 		));
156 156
157 157 
 		// Retrieve all extrafields if not already not know (should not happen)
158 
-		if (! is_object($extrafields)) {
158 
+		if (!is_object($extrafields)) {
159 159 
 			$extrafields = new ExtraFields($this->db);
160 160 
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161 
 		}
Please login to merge, or discard this patch.
htdocs/product/stats/facture_fournisseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -246,7 +246,7 @@
 
 block discarded – undo
246 246 
 						$supplierinvoicestatic->id = $objp->facid;
247 247 
 						$supplierinvoicestatic->ref = $objp->ref;
248 248 
 						$supplierinvoicestatic->ref_supplier = $objp->ref_supplier;
249 
-						$supplierinvoicestatic->libelle = $objp->label;	// deprecated
249 
+						$supplierinvoicestatic->libelle = $objp->label; // deprecated
250 250 
 						$supplierinvoicestatic->label = $objp->label;
251 251 
 						$supplierinvoicestatic->total_ht = $objp->total_ht;
252 252 
 						$supplierinvoicestatic->total_ttc = $objp->total_ttc;
Please login to merge, or discard this patch.
htdocs/adherents/admin/member_emails.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -56,16 +56,16 @@
 
 block discarded – undo
56 56 
 // Editing global variables not related to a specific theme
57 57 
 $constantes = array(
58 58 
 	'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
59 
-	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member','label'=>''),
60 
-	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member','label'=>''),
61 
-	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member','label'=>''),
62 
-	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member','label'=>''),
63 
-	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member','label'=>''),
64 
-	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member','label'=>''),
65 
-	'ADHERENT_MAIL_FROM'							=>array('type'=>'string','label'=>''),
66 
-	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string','label'=>''),
67 
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string','label'=>''),
68 
-	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'')
59 
+	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' 	=>array('type'=>'emailtemplate:member', 'label'=>''),
60 
+	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'			=>array('type'=>'emailtemplate:member', 'label'=>''),
61 
+	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'		=>array('type'=>'emailtemplate:member', 'label'=>''),
62 
+	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
63 
+	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'			=>array('type'=>'emailtemplate:member', 'label'=>''),
64 
+	'ADHERENT_EMAIL_TEMPLATE_EXCLUSION'				=>array('type'=>'emailtemplate:member', 'label'=>''),
65 
+	'ADHERENT_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
66 
+	'ADHERENT_CC_MAIL_FROM'							=>array('type'=>'string', 'label'=>''),
67 
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'		=>array('type'=>'string', 'label'=>''),
68 
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'				=>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'')
69 69 
 );
70 70
71 71
Please login to merge, or discard this patch.
htdocs/core/modules/facture/modules_facture.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -120,7 +120,7 @@  discard block
 
 block discarded – undo
120 120 
 		$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
121 121 
 			$this->emetteur->name,
122 122 
 			$this->emetteur->address,
123 
-			$this->emetteur->zip . " " . $this->emetteur->town,
123 
+			$this->emetteur->zip." ".$this->emetteur->town,
124 124 
 			$this->emetteur->country_code
125 125 
 		);
126 126 
 		if (!$address->isValid()) {
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
 			$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
176 176 
 				$object->thirdparty->name,
177 177 
 				$object->thirdparty->address,
178 
-				$object->thirdparty->zip . " " . $object->thirdparty->town,
178 
+				$object->thirdparty->zip." ".$object->thirdparty->town,
179 179 
 				$object->thirdparty->country_code
180 180 
 			);
181 181 
 			if (!$address->isValid()) {
Please login to merge, or discard this patch.
htdocs/core/modules/export/export_excel2007.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -363,7 +363,7 @@
 
 block discarded – undo
363 363 
 				if ($typefield == 'Text' || $typefield == 'TextAuto') {
364 364 
 					// If $newvalue start with an equal sign we don't want it to be interpreted as a formula, so we add a '. Such transformation should be
365 365 
 					// done by SetCellValueByColumnAndRow but it is not, so we do it ourself.
366 
-					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '') . $newvalue;
366 
+					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '').$newvalue;
367 367 
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
368 368 
 					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
369 369 
 					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
Please login to merge, or discard this patch.