';
print '| '.$langs->trans("ForceBuyingPriceIfNull").' | ';
print '';
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
print ajax_constantonoff('ForceBuyingPriceIfNull');
} else {
- if (empty($conf->global->ForceBuyingPriceIfNull))
- {
+ if (empty($conf->global->ForceBuyingPriceIfNull)) {
print ''.img_picto($langs->trans("Disabled"), 'off').'';
} else {
print ''.img_picto($langs->trans("Enabled"), 'on').'';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index d97d992b99d..717e2d02c1b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -39,16 +39,21 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield)
-{
- if ($agentid > 0)
+if (!$sortorder) {
+ $sortorder = "ASC";
+}
+if (!$sortfield) {
+ if ($agentid > 0) {
$sortfield = "s.nom";
- else $sortfield = "u.lastname";
+ } else {
+ $sortfield = "u.lastname";
+ }
}
$startdate = $enddate = '';
@@ -60,10 +65,12 @@ $enddateday = GETPOST('enddateday', 'int');
$enddatemonth = GETPOST('enddatemonth', 'int');
$enddateyear = GETPOST('enddateyear', 'int');
-if (!empty($startdatemonth))
+if (!empty($startdatemonth)) {
$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
-if (!empty($enddatemonth))
+}
+if (!empty($enddatemonth)) {
$enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
+}
// Security check
if ($user->rights->margins->read->all) {
@@ -154,23 +161,31 @@ $sql .= " WHERE f.fk_soc = s.rowid";
$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
$sql .= " AND sc.fk_soc = f.fk_soc";
$sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
-if (!empty($conf->global->AGENT_CONTACT_TYPE))
+if (!empty($conf->global->AGENT_CONTACT_TYPE)) {
$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else $sql .= " AND sc.fk_user = u.rowid";
+} else {
+ $sql .= " AND sc.fk_user = u.rowid";
+}
$sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
$sql .= ' AND s.entity IN ('.getEntity('societe').')';
$sql .= " AND d.fk_facture = f.rowid";
if ($agentid > 0) {
- if (!empty($conf->global->AGENT_CONTACT_TYPE))
- $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
- else $sql .= " AND sc.fk_user = ".$agentid;
+ if (!empty($conf->global->AGENT_CONTACT_TYPE)) {
+ $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+ } else {
+ $sql .= " AND sc.fk_user = ".$agentid;
+ }
+}
+if (!empty($startdate)) {
+ $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
+}
+if (!empty($enddate)) {
+ $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
}
-if (!empty($startdate))
- $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
- $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
$sql .= " AND d.buy_price_ht IS NOT NULL";
-if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+ $sql .= " AND d.buy_price_ht <> 0";
+}
//if ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
//else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
$sql .= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
@@ -183,28 +198,42 @@ print '
';
print img_info('').' '.$langs->trans("MarginPerSaleRepresentativeWarning").'
';
$param = '';
-if (!empty($agentid)) $param .= "&agentid=".urlencode($agentid);
-if (!empty($startdateday)) $param .= "&startdateday=".urlencode($startdateday);
-if (!empty($startdatemonth)) $param .= "&startdatemonth=".urlencode($startdatemonth);
-if (!empty($startdateyear)) $param .= "&startdateyear=".urlencode($startdateyear);
-if (!empty($enddateday)) $param .= "&enddateday=".urlencode($enddateday);
-if (!empty($enddatemonth)) $param .= "&enddatemonth=".urlencode($enddatemonth);
-if (!empty($enddateyear)) $param .= "&enddateyear=".urlencode($enddateyear);
+if (!empty($agentid)) {
+ $param .= "&agentid=".urlencode($agentid);
+}
+if (!empty($startdateday)) {
+ $param .= "&startdateday=".urlencode($startdateday);
+}
+if (!empty($startdatemonth)) {
+ $param .= "&startdatemonth=".urlencode($startdatemonth);
+}
+if (!empty($startdateyear)) {
+ $param .= "&startdateyear=".urlencode($startdateyear);
+}
+if (!empty($enddateday)) {
+ $param .= "&enddateday=".urlencode($enddateday);
+}
+if (!empty($enddatemonth)) {
+ $param .= "&enddatemonth=".urlencode($enddatemonth);
+}
+if (!empty($enddateyear)) {
+ $param .= "&enddateyear=".urlencode($enddateyear);
+}
dol_syslog('margin::agentMargins.php', LOG_DEBUG);
$result = $db->query($sql);
-if ($result)
-{
+if ($result) {
$num = $db->num_rows($result);
print '
';
print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
- if ($conf->global->MARGIN_TYPE == "1")
+ if ($conf->global->MARGIN_TYPE == "1") {
$labelcostprice = 'BuyingPrice';
- else // value is 'costprice' or 'pmp'
+ } else { // value is 'costprice' or 'pmp'
$labelcostprice = 'CostPrice';
+ }
$moreforfilter = '';
@@ -213,21 +242,24 @@ if ($result)
print ''."\n";
print '';
- if ($agentid > 0)
+ if ($agentid > 0) {
print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
- else print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+ } else {
+ print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+ }
print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", $param, '', $sortfield, $sortorder, 'right ');
- if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
- if (!empty($conf->global->DISPLAY_MARK_RATES))
+ }
+ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
print " \n";
- if ($num > 0)
- {
+ if ($num > 0) {
$group_list = array();
while ($objp = $db->fetch_object($result)) {
if ($agentid > 0) {
@@ -295,10 +327,12 @@ if ($result)
print ''.price(price2num($pv, 'MT')).' | ';
print ''.price(price2num($pa, 'MT')).' | ';
print ''.price(price2num($marge, 'MT')).' | ';
- if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").' | ';
- if (!empty($conf->global->DISPLAY_MARK_RATES))
+ }
+ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
print ''.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").' | ';
+ }
print "\n";
$i++;
@@ -319,10 +353,12 @@ if ($result)
print ''.price(price2num($cumul_vente, 'MT')).' | ';
print ''.price(price2num($cumul_achat, 'MT')).' | ';
print ''.price(price2num($totalMargin, 'MT')).' | ';
- if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").' | ';
- if (!empty($conf->global->DISPLAY_MARK_RATES))
+ }
+ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
print ''.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").' | ';
+ }
print '';
print ' ';
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 5d019b2693a..f61d8d02e55 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -44,12 +44,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = 'f.ref';
+if (!$sortorder) {
+ $sortorder = "DESC";
+}
+if (!$sortfield) {
+ $sortfield = 'f.ref';
+}
$startdate = $enddate = '';
@@ -73,15 +79,20 @@ if (GETPOST("button_search_x") || GETPOST("button_search")) {
* Actions
*/
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+ $action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+ $massaction = '';
+}
$parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
-if (empty($reshook))
-{
+if (empty($reshook)) {
// Selection of new fields
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -108,23 +119,22 @@ if (empty($reshook))
}
// Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
- {
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$search_ref = '';
$search_array_options = array();
}
// Mass actions
/*
- $objectclass='Product';
- if ((string) $type == '1') { $objectlabel='Services'; }
- if ((string) $type == '0') { $objectlabel='Products'; }
+ $objectclass='Product';
+ if ((string) $type == '1') { $objectlabel='Services'; }
+ if ((string) $type == '0') { $objectlabel='Products'; }
- $permissiontoread = $user->rights->produit->lire;
- $permissiontodelete = $user->rights->produit->supprimer;
- $uploaddir = $conf->product->dir_output;
- include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
- */
+ $permissiontoread = $user->rights->produit->lire;
+ $permissiontodelete = $user->rights->produit->supprimer;
+ $uploaddir = $conf->product->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+ */
}
@@ -146,12 +156,24 @@ llxHeader('', $title);
// print load_fiche_titre($text);
$param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($search_ref != '') $param .= '&search_ref='.urlencode($search_ref);
-if (!empty($startdate)) $param .= '&startdatemonth='.GETPOST('startdatemonth', 'int').'&startdateday='.GETPOST('startdateday', 'int').'&startdateyear='.GETPOST('startdateyear', 'int');
-if (!empty($enddate)) $param .= '&enddatemonth='.GETPOST('enddatemonth', 'int').'&enddateday='.GETPOST('enddateday', 'int').'&enddateyear='.GETPOST('enddateyear', 'int');
-if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+ $param .= '&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+ $param .= '&limit='.$limit;
+}
+if ($search_ref != '') {
+ $param .= '&search_ref='.urlencode($search_ref);
+}
+if (!empty($startdate)) {
+ $param .= '&startdatemonth='.GETPOST('startdatemonth', 'int').'&startdateday='.GETPOST('startdateday', 'int').'&startdateyear='.GETPOST('startdateyear', 'int');
+}
+if (!empty($enddate)) {
+ $param .= '&enddatemonth='.GETPOST('enddatemonth', 'int').'&enddateday='.GETPOST('enddateday', 'int').'&enddateyear='.GETPOST('enddateyear', 'int');
+}
+if ($optioncss != '') {
+ $param .= '&optioncss='.$optioncss;
+}
// Show tabs
$head = marges_prepare_head($user);
@@ -194,9 +216,15 @@ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as d ON d.fk_facture = f.rowi
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
$sql .= " WHERE f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
$sql .= " AND f.entity IN (".getEntity('invoice').") ";
-if (!empty($startdate)) $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate)) $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
-if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
+if (!empty($startdate)) {
+ $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
+}
+if (!empty($enddate)) {
+ $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
+}
+if ($search_ref) {
+ $sql .= natural_search('f.ref', $search_ref);
+}
$sql .= " AND d.buy_price_ht IS NOT NULL";
$sql .= $db->order($sortfield, $sortorder);
@@ -205,8 +233,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
dol_syslog(__FILE__, LOG_DEBUG);
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
- if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
- {
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
@@ -221,10 +248,11 @@ if ($result) {
print '
';
print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
- if ($conf->global->MARGIN_TYPE == "1")
+ if ($conf->global->MARGIN_TYPE == "1") {
$labelcostprice = 'BuyingPrice';
- else // value is 'costprice' or 'pmp'
+ } else { // value is 'costprice' or 'pmp'
$labelcostprice = 'CostPrice';
+ }
$moreforfilter = '';
@@ -260,8 +288,7 @@ if ($result) {
print " |
\n";
$i = 0;
- while ($i < min($num, $limit))
- {
+ while ($i < min($num, $limit)) {
$objp = $db->fetch_object($result);
print '