Merge branch 'develop' into masknextvalue
This commit is contained in:
commit
1d4b1cebfc
37 changed files with 657 additions and 135 deletions
|
|
@ -177,6 +177,7 @@ NEW: Add option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after specific a
|
|||
NEW: Widgets: Implement MAIN_ACTIVATE_FILECACHE on birthday widget
|
||||
NEW: Widgets: Add widget "The next upcoming events"
|
||||
NEW: Widgets: Add widget of open opportunities
|
||||
NEW: Use an ajax component to swith prospection status on thidparty list
|
||||
|
||||
For developers or integrators:
|
||||
------------------------------
|
||||
|
|
|
|||
|
|
@ -2510,8 +2510,8 @@ class Adherent extends CommonObject
|
|||
$labelStatusShort = $langs->trans("MemberStatusNoSubscriptionShort");
|
||||
} elseif (!$date_end_subscription) {
|
||||
$statusType = 'status1';
|
||||
$labelStatus = $langs->trans("MemberStatusActive");
|
||||
$labelStatusShort = $langs->trans("MemberStatusActiveShort");
|
||||
$labelStatus = $langs->trans("WaitingSubscription");
|
||||
$labelStatusShort = $langs->trans("WaitingSubscriptionShort");
|
||||
} elseif ($date_end_subscription < dol_now()) { // expired
|
||||
$statusType = 'status8';
|
||||
$labelStatus = $langs->trans("MemberStatusActiveLate");
|
||||
|
|
|
|||
|
|
@ -121,6 +121,8 @@ class Documents extends DolibarrApi
|
|||
*
|
||||
* Test sample 1: { "modulepart": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
|
||||
*
|
||||
* Supported modules: invoice, order, proposal, contract
|
||||
*
|
||||
* @param string $modulepart Name of module or area concerned by file download ('thirdparty', 'member', 'proposal', 'supplier_proposal', 'order', 'supplier_order', 'invoice', 'supplier_invoice', 'shipment', 'project', ...)
|
||||
* @param string $original_file Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
|
||||
* @param string $doctemplate Set here the doc template to use for document generation (If not set, use the default template).
|
||||
|
|
@ -256,6 +258,8 @@ class Documents extends DolibarrApi
|
|||
/**
|
||||
* Return the list of documents of a dedicated element (from its ID or Ref)
|
||||
*
|
||||
* Supported modules: thirdparty, user, member, proposal, order, supplier_order, shipment, invoice, supplier_invoice, product, event, expensereport, knowledgemanagement, category, contract
|
||||
*
|
||||
* @param string $modulepart Name of module or area concerned ('thirdparty', 'member', 'proposal', 'order', 'invoice', 'supplier_invoice', 'shipment', 'project', ...)
|
||||
* @param int $id ID of element
|
||||
* @param string $ref Ref of element
|
||||
|
|
@ -583,6 +587,8 @@ class Documents extends DolibarrApi
|
|||
* Test sample for supplier invoice: { "filename": "mynewfile.txt", "modulepart": "supplier_invoice", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
|
||||
* Test sample for medias file: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "Y29udGVudCB0ZXh0Cg==", "fileencoding": "base64", "overwriteifexists": "0" }.
|
||||
*
|
||||
* Supported modules: invoice, order, supplier_order, task/project_task, product/service, expensereport, fichinter, member, propale, agenda, contact
|
||||
*
|
||||
* @param string $filename Name of file to create ('FA1705-0123.txt')
|
||||
* @param string $modulepart Name of module or area concerned by file upload ('product', 'service', 'invoice', 'proposal', 'project', 'project_task', 'supplier_invoice', 'expensereport', 'member', ...)
|
||||
* @param string $ref Reference of object (This will define subdir automatically and store submited file into it)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ use Luracast\Restler\RestException;
|
|||
|
||||
require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/cstate.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/cregion.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
|
||||
|
||||
|
|
@ -236,6 +237,107 @@ class Setup extends DolibarrApi
|
|||
|
||||
return $list;
|
||||
}
|
||||
/**
|
||||
* Get the list of regions.
|
||||
*
|
||||
* The returned list is sorted by region ID.
|
||||
*
|
||||
* @param string $sortfield Sort field
|
||||
* @param string $sortorder Sort order
|
||||
* @param int $limit Number of items per page
|
||||
* @param int $page Page number (starting from zero)
|
||||
* @param int $country To filter on country
|
||||
* @param string $filter To filter the regions by name
|
||||
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
|
||||
* @return array List of regions
|
||||
*
|
||||
* @url GET dictionary/regions
|
||||
*
|
||||
* @throws RestException
|
||||
*/
|
||||
public function getListOfRegions($sortfield = "code_region", $sortorder = 'ASC', $limit = 100, $page = 0, $country = 0, $filter = '', $sqlfilters = '')
|
||||
{
|
||||
$list = array();
|
||||
|
||||
// Note: The filter is not applied in the SQL request because it must
|
||||
// be applied to the translated names, not to the names in database.
|
||||
$sql = "SELECT t.rowid FROM ".MAIN_DB_PREFIX."c_regions as t";
|
||||
$sql .= " WHERE 1 = 1";
|
||||
if ($country) {
|
||||
$sql .= " AND t.fk_pays = ".((int) $country);
|
||||
}
|
||||
// Add sql filters
|
||||
if ($sqlfilters) {
|
||||
$errormessage = '';
|
||||
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
|
||||
throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
|
||||
}
|
||||
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
|
||||
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
|
||||
}
|
||||
|
||||
$sql .= $this->db->order($sortfield, $sortorder);
|
||||
|
||||
if ($limit) {
|
||||
if ($page < 0) {
|
||||
$page = 0;
|
||||
}
|
||||
$offset = $limit * $page;
|
||||
|
||||
$sql .= $this->db->plimit($limit, $offset);
|
||||
}
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
|
||||
if ($result) {
|
||||
$num = $this->db->num_rows($result);
|
||||
$min = min($num, ($limit <= 0 ? $num : $limit));
|
||||
for ($i = 0; $i < $min; $i++) {
|
||||
$obj = $this->db->fetch_object($result);
|
||||
$region = new Cregion($this->db);
|
||||
if ($region->fetch($obj->rowid) > 0) {
|
||||
if (empty($filter) || stripos($region->name, $filter) !== false) {
|
||||
$list[] = $this->_cleanObjectDatas($region);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new RestException(503, 'Error when retrieving list of regions');
|
||||
}
|
||||
|
||||
return $list;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get region by ID.
|
||||
*
|
||||
* @param int $id ID of region
|
||||
* @return array Array of cleaned object properties
|
||||
*
|
||||
* @url GET dictionary/regions/{id}
|
||||
*
|
||||
* @throws RestException
|
||||
*/
|
||||
public function getRegionByID($id)
|
||||
{
|
||||
return $this->_fetchCregion($id, '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get region by Code.
|
||||
*
|
||||
* @param string $code Code of region
|
||||
* @return array Array of cleaned object properties
|
||||
*
|
||||
* @url GET dictionary/regions/byCode/{code}
|
||||
*
|
||||
* @throws RestException
|
||||
*/
|
||||
public function getRegionByCode($code)
|
||||
{
|
||||
return $this->_fetchCregion('', $code);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the list of states/provinces.
|
||||
*
|
||||
|
|
@ -464,6 +566,29 @@ class Setup extends DolibarrApi
|
|||
return $this->_fetchCcountry('', '', $iso, $lang);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get region.
|
||||
*
|
||||
* @param int $id ID of region
|
||||
* @param string $code Code of region
|
||||
* @return array Array of cleaned object properties
|
||||
*
|
||||
* @throws RestException
|
||||
*/
|
||||
private function _fetchCregion($id, $code = '')
|
||||
{
|
||||
$region = new Cregion($this->db);
|
||||
|
||||
$result = $region->fetch($id, $code);
|
||||
if ($result < 0) {
|
||||
throw new RestException(503, 'Error when retrieving region : '.$region->error);
|
||||
} elseif ($result == 0) {
|
||||
throw new RestException(404, 'Region not found');
|
||||
}
|
||||
|
||||
return $this->_cleanObjectDatas($region);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get state.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// Payment terms of the settlement
|
||||
if ($action == 'setconditions' && $user->rights->societe->creer) {
|
||||
if ($action == 'setconditions' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
|
||||
if ($result < 0) {
|
||||
|
|
@ -179,7 +179,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// Payment mode
|
||||
if ($action == 'setmode' && $user->rights->societe->creer) {
|
||||
if ($action == 'setmode' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
|
||||
if ($result < 0) {
|
||||
|
|
@ -188,7 +188,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// Transport mode
|
||||
if ($action == 'settransportmode' && $user->rights->societe->creer) {
|
||||
if ($action == 'settransportmode' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setTransportMode(GETPOST('transport_mode_id', 'alpha'));
|
||||
if ($result < 0) {
|
||||
|
|
@ -197,7 +197,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// Bank account
|
||||
if ($action == 'setbankaccount' && $user->rights->societe->creer) {
|
||||
if ($action == 'setbankaccount' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
|
||||
if ($result < 0) {
|
||||
|
|
@ -206,7 +206,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// customer preferred shipping method
|
||||
if ($action == 'setshippingmethod' && $user->rights->societe->creer) {
|
||||
if ($action == 'setshippingmethod' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
|
||||
if ($result < 0) {
|
||||
|
|
@ -215,7 +215,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// assujetissement a la TVA
|
||||
if ($action == 'setassujtva' && $user->rights->societe->creer) {
|
||||
if ($action == 'setassujtva' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$object->tva_assuj = GETPOST('assujtva_value');
|
||||
$result = $object->update($object->id);
|
||||
|
|
@ -225,7 +225,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// set prospect level
|
||||
if ($action == 'setprospectlevel' && $user->rights->societe->creer) {
|
||||
if ($action == 'setprospectlevel' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$object->fk_prospectlevel = GETPOST('prospect_level_id', 'alpha');
|
||||
$result = $object->update($object->id, $user);
|
||||
|
|
@ -267,7 +267,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// Set sales representatives
|
||||
if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer) {
|
||||
if ($action == 'set_salesrepresentatives' && $user->hasRight('societe', 'creer')) {
|
||||
$object->fetch($id);
|
||||
$result = $object->setSalesRep(GETPOST('commercial', 'array'));
|
||||
}
|
||||
|
|
@ -295,7 +295,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
|
||||
// warehouse
|
||||
if ($action == 'setwarehouse' && $user->rights->societe->creer) {
|
||||
if ($action == 'setwarehouse' && $user->hasRight('societe', 'creer')) {
|
||||
$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
|
||||
}
|
||||
}
|
||||
|
|
@ -360,9 +360,9 @@ if ($object->id > 0) {
|
|||
|
||||
print '<tr>';
|
||||
print '<td>';
|
||||
print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer);
|
||||
print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer);
|
||||
print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -408,7 +408,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td>';
|
||||
print $langs->trans('PaymentConditions');
|
||||
print '<td>';
|
||||
if (($action != 'editconditions') && $user->rights->societe->creer) {
|
||||
if (($action != 'editconditions') && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -426,7 +426,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans('PaymentMode');
|
||||
print '<td>';
|
||||
if (($action != 'editmode') && $user->rights->societe->creer) {
|
||||
if (($action != 'editmode') && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -445,7 +445,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans('PaymentBankAccount');
|
||||
print '<td>';
|
||||
if (($action != 'editbankaccount') && $user->rights->societe->creer) {
|
||||
if (($action != 'editbankaccount') && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -467,7 +467,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans("CustomerRelativeDiscountShort");
|
||||
print '<td><td class="right">';
|
||||
if ($user->rights->societe->creer && !$user->socid > 0) {
|
||||
if ($user->hasRight('societe', 'creer') && !$user->socid > 0) {
|
||||
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
|
||||
}
|
||||
print '</td></tr></table>';
|
||||
|
|
@ -480,7 +480,7 @@ if ($object->id > 0) {
|
|||
print '<tr><td class="nowrap">';
|
||||
print $langs->trans("CustomerAbsoluteDiscountShort");
|
||||
print '<td><td class="right">';
|
||||
if ($user->rights->societe->creer && !$user->socid > 0) {
|
||||
if ($user->hasRight('societe', 'creer') && !$user->socid > 0) {
|
||||
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
|
||||
}
|
||||
print '</td></tr></table>';
|
||||
|
|
@ -502,10 +502,10 @@ if ($object->id > 0) {
|
|||
if ($object->client) {
|
||||
print '<tr class="nowrap">';
|
||||
print '<td>';
|
||||
print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
|
||||
print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td><td>';
|
||||
$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
|
||||
print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
|
||||
print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->hasRight('societe', 'creer'), $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -515,9 +515,9 @@ if ($object->id > 0) {
|
|||
print '<!-- Minimim amount for orders -->'."\n";
|
||||
print '<tr class="nowrap">';
|
||||
print '<td>';
|
||||
print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
|
||||
print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
|
||||
print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->hasRight('societe', 'creer'), $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
|
@ -530,7 +530,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans("PriceLevel");
|
||||
print '<td><td class="right">';
|
||||
if ($user->rights->societe->creer) {
|
||||
if ($user->hasRight('societe', 'creer')) {
|
||||
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
|
||||
}
|
||||
print '</td></tr></table>';
|
||||
|
|
@ -551,7 +551,7 @@ if ($object->id > 0) {
|
|||
$formproduct = new FormProduct($db);
|
||||
print '<tr class="nowrap">';
|
||||
print '<td>';
|
||||
print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $user->rights->societe->creer);
|
||||
print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $user->hasRight('societe', 'creer'));
|
||||
print '</td><td>';
|
||||
if ($action == 'editwarehouse') {
|
||||
$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'fk_warehouse', 1);
|
||||
|
|
@ -571,7 +571,7 @@ if ($object->id > 0) {
|
|||
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans('SendingMethod');
|
||||
print '<td>';
|
||||
if (($action != 'editshipping') && $user->rights->societe->creer) {
|
||||
if (($action != 'editshipping') && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -591,7 +591,7 @@ if ($object->id > 0) {
|
|||
print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
|
||||
print $langs->trans('IntracommReportTransportMode');
|
||||
print '<td>';
|
||||
if (($action != 'edittransportmode') && $user->rights->societe->creer) {
|
||||
if (($action != 'edittransportmode') && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -654,7 +654,7 @@ if ($object->id > 0) {
|
|||
print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
|
||||
print $langs->trans('ProspectLevel');
|
||||
print '<td>';
|
||||
if ($action != 'editlevel' && $user->rights->societe->creer) {
|
||||
if ($action != 'editlevel' && $user->hasRight('societe', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
|
|
@ -695,7 +695,7 @@ if ($object->id > 0) {
|
|||
$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
|
||||
|
||||
// Lien recap
|
||||
$boxstat .= '<div class="box box-halfright">';
|
||||
$boxstat .= '<div class="box divboxtable box-halfright">';
|
||||
$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop boxtablenomarginbottom centpercent">';
|
||||
$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
|
||||
|
||||
|
|
@ -1026,7 +1026,7 @@ if ($object->id > 0) {
|
|||
/*
|
||||
* Latest shipments
|
||||
*/
|
||||
if (isModEnabled("expedition") && $user->rights->expedition->lire) {
|
||||
if (isModEnabled("expedition") && $user->hasRight('expedition', 'lire')) {
|
||||
$sql = 'SELECT e.rowid as id';
|
||||
$sql .= ', e.ref, e.entity';
|
||||
$sql .= ', e.date_creation';
|
||||
|
|
|
|||
|
|
@ -245,10 +245,10 @@ $arrayfields = array(
|
|||
'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
|
||||
'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
|
||||
'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
|
||||
'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
|
||||
'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
|
||||
'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
|
||||
'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
|
||||
'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
|
||||
'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
|
||||
'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
|
||||
'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
|
||||
'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
|
||||
'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
|
||||
'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
|
||||
|
|
@ -285,17 +285,17 @@ foreach ($object->fields as $key => $val) {
|
|||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
|
||||
|
||||
// Permissions
|
||||
$permissiontoread = $user->rights->propal->lire;
|
||||
$permissiontoadd = $user->rights->propal->creer;
|
||||
$permissiontodelete = $user->rights->propal->supprimer;
|
||||
$permissiontoread = $user->hasRight('propal', 'lire');
|
||||
$permissiontoadd = $user->hasRight('propal', 'creer');
|
||||
$permissiontodelete = $user->hasRight('propal', 'supprimer');
|
||||
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
|
||||
$permissiontovalidate = $user->rights->propal->propal_advance->validate;
|
||||
$permissiontoclose = $user->rights->propal->propal_advance->close;
|
||||
$permissiontosendbymail = $user->rights->propal->propal_advance->send;
|
||||
$permissiontovalidate = $user->hasRight('propal', 'propal_advance', 'validate');
|
||||
$permissiontoclose = $user->hasRight('propal', 'propal_advance', 'close');
|
||||
$permissiontosendbymail = $user->hasRight('propal', 'propal_advance', 'send');
|
||||
} else {
|
||||
$permissiontovalidate = $user->rights->propal->creer;
|
||||
$permissiontoclose = $user->rights->propal->creer;
|
||||
$permissiontosendbymail = $user->rights->propal->lire;
|
||||
$permissiontovalidate = $user->hasRight('propal', 'creer');
|
||||
$permissiontoclose = $user->hasRight('propal', 'creer');
|
||||
$permissiontosendbymail = $user->hasRight('propal', 'lire');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1082,7 +1082,7 @@ if ($resql) {
|
|||
$newcardbutton = '';
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);
|
||||
$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('propal', 'creer'));
|
||||
|
||||
// Fields title search
|
||||
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
|
|
@ -1151,7 +1151,7 @@ if ($resql) {
|
|||
$formcategory = new FormCategory($db);
|
||||
$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
|
||||
}
|
||||
if (isModEnabled('categorie') && $user->rights->categorie->lire) {
|
||||
if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
|
||||
$moreforfilter .= '<div class="divsearchfield">';
|
||||
$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
|
||||
|
|
@ -2335,8 +2335,8 @@ if ($resql) {
|
|||
$urlsource .= str_replace('&', '&', $param);
|
||||
|
||||
$filedir = $diroutputmassaction;
|
||||
$genallowed = $user->rights->propal->lire;
|
||||
$delallowed = $user->rights->propal->creer;
|
||||
$genallowed = $user->hasRight('propal', 'lire');
|
||||
$delallowed = $user->hasRight('propal', 'creer');
|
||||
|
||||
print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -5111,7 +5111,7 @@ if ($action == 'create') {
|
|||
}
|
||||
print '</td>';
|
||||
$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
|
||||
print '<td>'.$label.' '.$objp->num_payment.'</td>';
|
||||
print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($label.' '.$objp->num_payment).'">'.dol_escape_htmltag($label.' '.$objp->num_payment).'</td>';
|
||||
if (isModEnabled("banque")) {
|
||||
$bankaccountstatic->id = $objp->baid;
|
||||
$bankaccountstatic->ref = $objp->baref;
|
||||
|
|
|
|||
|
|
@ -1867,7 +1867,7 @@ if ($action == 'create') {
|
|||
|
||||
// Area with status and activation info of line
|
||||
if ($object->statut > 0) {
|
||||
print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
|
||||
print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
|
||||
|
||||
print '<tr class="oddeven" '.$moreparam.'>';
|
||||
print '<td><span class="valignmiddle hideonsmartphone">'.$langs->trans("ServiceStatus").':</span> '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
|
||||
|
|
@ -1938,7 +1938,7 @@ if ($action == 'create') {
|
|||
print '<input type="hidden" name="ligne" value="'.GETPOST('ligne', 'int').'">';
|
||||
print '<input type="hidden" name="confirm" value="yes">';
|
||||
|
||||
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
|
||||
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
|
||||
|
||||
// Definie date debut et fin par defaut
|
||||
$dateactstart = $objp->date_start;
|
||||
|
|
@ -1995,7 +1995,7 @@ if ($action == 'create') {
|
|||
print '<input type="hidden" name="action" value="confirm_closeline">';
|
||||
print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
|
||||
|
||||
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
|
||||
print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
|
||||
|
||||
// Definie date debut et fin par defaut
|
||||
$dateactstart = $objp->date_start_real;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2015-2023 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2021-2022 Waël Almoman <info@almoman.com>
|
||||
* Copyright (C) 2021-2023 Waël Almoman <info@almoman.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -119,13 +119,13 @@ class box_members_by_tags extends ModeleBoxes
|
|||
'text' => $labelstatus,
|
||||
);
|
||||
// Up to date
|
||||
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
|
||||
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, $now + 86400, 1);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
|
||||
'text' => $labelstatus,
|
||||
);
|
||||
// Expired
|
||||
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
|
||||
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, $now - 86400, 1);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
|
||||
'text' => $labelstatus
|
||||
|
|
@ -143,25 +143,24 @@ class box_members_by_tags extends ModeleBoxes
|
|||
'text' => $labelstatus
|
||||
);
|
||||
// Total row
|
||||
$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($langs->trans("Total")).'"',
|
||||
'text' => $langs->trans("Total")
|
||||
);
|
||||
$line++;
|
||||
foreach ($sumMembers as $key => $data) {
|
||||
$adhtype = new AdherentType($this->db);
|
||||
$adhtype->id = $key;
|
||||
$adhtag = new Categorie($db);
|
||||
$adhtag->id = $key;
|
||||
|
||||
if ($key=='total') {
|
||||
break;
|
||||
}
|
||||
$adhtype->label = $data['label'];
|
||||
$AdherentType[$key] = $adhtype;
|
||||
$adhtag->label = $data['label'];
|
||||
$AdherentTag[$key] = $adhtag;
|
||||
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
|
||||
'text' => $adhtype->getNomUrl(1, dol_size(32)),
|
||||
'text' => $adhtag->getNomUrl(0, '', dol_size(32), '&backtolist='.urlencode($_SERVER["PHP_SELF"])),
|
||||
'asis' => 1,
|
||||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
|
|
@ -171,17 +170,17 @@ class box_members_by_tags extends ModeleBoxes
|
|||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right"',
|
||||
'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
|
||||
'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
|
||||
'asis' => 1,
|
||||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right"',
|
||||
'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, 0, 3),
|
||||
'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, $now + 86400, 3),
|
||||
'asis' => 1,
|
||||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right"',
|
||||
'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
|
||||
'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now - 86400, 3),
|
||||
'asis' => 1,
|
||||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
|
|
@ -196,7 +195,7 @@ class box_members_by_tags extends ModeleBoxes
|
|||
);
|
||||
$this->info_box_contents[$line][] = array(
|
||||
'td' => 'class="right"',
|
||||
'text' => (isset($data['total_adhtype']) && $data['total_adhtype'] > 0 ? $data['total_adhtype'] : ''),
|
||||
'text' => (isset($data['total_adhtag']) && $data['total_adhtag'] > 0 ? $data['total_adhtag'] : ''),
|
||||
'asis' => 1,
|
||||
);
|
||||
$line++;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class box_members_by_type extends ModeleBoxes
|
|||
$this->enabled = 0; // disabled for external users
|
||||
}
|
||||
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class box_members_last_modified extends ModeleBoxes
|
|||
$this->enabled = 0; // disabled for external users
|
||||
}
|
||||
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class box_members_last_subscriptions extends ModeleBoxes
|
|||
$this->enabled = 0; // disabled for external users
|
||||
}
|
||||
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
|
|||
$this->enabled = 0; // disabled for external users
|
||||
}
|
||||
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
|
||||
$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
|
|||
|
||||
$out .= "\n<!-- Box ".get_class($this)." start -->\n";
|
||||
|
||||
$out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
|
||||
$out .= '<div class="box divboxtable boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
|
||||
|
||||
if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines) {
|
||||
$out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
|
||||
|
|
|
|||
328
htdocs/core/class/cregion.class.php
Normal file
328
htdocs/core/class/cregion.class.php
Normal file
|
|
@ -0,0 +1,328 @@
|
|||
<?php
|
||||
/* Copyright (C) Richard Rondu <rondu.richard@lainwir3d.net>
|
||||
* Copyright (C) 2007-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/core/class/cregion.class.php
|
||||
* \ingroup core
|
||||
* \brief This file is a CRUD class file (Create/Read/Update/Delete) for c_regions dictionary
|
||||
*/
|
||||
|
||||
/**
|
||||
* Class to manage dictionary Regions
|
||||
*/
|
||||
class Cregion
|
||||
{
|
||||
/**
|
||||
* @var DoliDB Database handler.
|
||||
*/
|
||||
public $db;
|
||||
|
||||
/**
|
||||
* @var string Error code (or message)
|
||||
*/
|
||||
public $error = '';
|
||||
|
||||
/**
|
||||
* @var string[] Error codes (or messages)
|
||||
*/
|
||||
public $errors = array();
|
||||
|
||||
//public $element = 'cregion'; //!< Id that identify managed objects
|
||||
//public $table_element = 'c_regions'; //!< Name of table without prefix where object is stored
|
||||
|
||||
/**
|
||||
* @var int ID
|
||||
*/
|
||||
public $id;
|
||||
|
||||
public $code_region;
|
||||
public $fk_pays;
|
||||
|
||||
/**
|
||||
* @var string Region name
|
||||
*/
|
||||
public $name;
|
||||
|
||||
/**
|
||||
* @var string Region chef lieu
|
||||
*/
|
||||
public $cheflieu;
|
||||
|
||||
public $active;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param DoliDb $db Database handler
|
||||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
$this->db = $db;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create object into database
|
||||
*
|
||||
* @param User $user User that create
|
||||
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||
* @return int <0 if KO, Id of created object if OK
|
||||
*/
|
||||
public function create($user, $notrigger = 0)
|
||||
{
|
||||
global $conf, $langs;
|
||||
$error = 0;
|
||||
|
||||
// Clean parameters
|
||||
if (isset($this->code_region)) {
|
||||
$this->code_region = trim($this->code_region);
|
||||
}
|
||||
if (isset($this->fk_pays)) {
|
||||
$this->fk_pays = trim($this->fk_pays);
|
||||
}
|
||||
if (isset($this->nom)) {
|
||||
$this->nom = trim($this->nom);
|
||||
}
|
||||
if (isset($this->cheflieu)) {
|
||||
$this->cheflieu = trim($this->cheflieu);
|
||||
}
|
||||
if (isset($this->active)) {
|
||||
$this->active = trim($this->active);
|
||||
}
|
||||
|
||||
// Check parameters
|
||||
// Put here code to add control on parameters values
|
||||
|
||||
// Insert request
|
||||
$sql = "INSERT INTO ".$this->db->prefix()."c_regions(";
|
||||
$sql .= "rowid,";
|
||||
$sql .= "code_region,";
|
||||
$sql .= "fk_pays,";
|
||||
$sql .= "nom,";
|
||||
$sql .= "cheflieu,";
|
||||
$sql .= "active";
|
||||
$sql .= ") VALUES (";
|
||||
$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
|
||||
$sql .= " ".(!isset($this->code_region) ? 'NULL' : "'".$this->db->escape($this->code_region)."'").",";
|
||||
$sql .= " ".(!isset($this->fk_pays) ? 'NULL' : "'".$this->db->escape($this->fk_pays)."'").",";
|
||||
$sql .= " ".(!isset($this->name) ? 'NULL' : "'".$this->db->escape($this->name)."'").",";
|
||||
$sql .= " ".(!isset($this->cheflieu) ? 'NULL' : "'".$this->db->escape($this->cheflieu)."'").",";
|
||||
$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
|
||||
$sql .= ")";
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
dol_syslog(get_class($this)."::create", LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
if (!$resql) {
|
||||
$error++;
|
||||
$this->errors[] = "Error ".$this->db->lasterror();
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
$this->id = $this->db->last_insert_id($this->db->prefix()."c_regions");
|
||||
}
|
||||
|
||||
// Commit or rollback
|
||||
if ($error) {
|
||||
foreach ($this->errors as $errmsg) {
|
||||
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
|
||||
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
|
||||
}
|
||||
$this->db->rollback();
|
||||
return -1 * $error;
|
||||
} else {
|
||||
$this->db->commit();
|
||||
return $this->id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Load object in memory from database
|
||||
*
|
||||
* @param int $id Id object
|
||||
* @param string $code_region Code
|
||||
* @param string $fk_pays Country Id
|
||||
* @return int >0 if OK, 0 if not found, <0 if KO
|
||||
*/
|
||||
public function fetch($id, $code_region = '', $fk_pays = '')
|
||||
{
|
||||
$sql = "SELECT";
|
||||
$sql .= " t.rowid,";
|
||||
$sql .= " t.code_region,";
|
||||
$sql .= " t.fk_pays,";
|
||||
$sql .= " t.nom,";
|
||||
$sql .= " t.cheflieu,";
|
||||
$sql .= " t.active";
|
||||
$sql .= " FROM ".$this->db->prefix()."c_regions as t";
|
||||
if ($id) {
|
||||
$sql .= " WHERE t.rowid = ".((int) $id);
|
||||
} elseif ($code_region) {
|
||||
$sql .= " WHERE t.code_region = '".$this->db->escape(strtoupper($code_region))."'";
|
||||
} elseif ($fk_pays) {
|
||||
$sql .= " WHERE t.fk_pays = '".$this->db->escape(strtoupper($fk_pays))."'";
|
||||
}
|
||||
|
||||
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if ($this->db->num_rows($resql)) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
||||
if ($obj) {
|
||||
$this->id = $obj->rowid;
|
||||
$this->code_region = $obj->code_region;
|
||||
$this->fk_pays = $obj->fk_pays;
|
||||
$this->name = $obj->nom;
|
||||
$this->cheflieu = $obj->cheflieu;
|
||||
$this->active = $obj->active;
|
||||
}
|
||||
|
||||
$this->db->free($resql);
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
$this->error = "Error ".$this->db->lasterror();
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update object into database
|
||||
*
|
||||
* @param User $user User that modify
|
||||
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
public function update($user = null, $notrigger = 0)
|
||||
{
|
||||
global $conf, $langs;
|
||||
$error = 0;
|
||||
|
||||
// Clean parameters
|
||||
if (isset($this->code_region)) {
|
||||
$this->code_region = trim($this->code_region);
|
||||
}
|
||||
if (isset($this->fk_pays)) {
|
||||
$this->fk_pays = trim($this->fk_pays);
|
||||
}
|
||||
if (isset($this->name)) {
|
||||
$this->name = trim($this->name);
|
||||
}
|
||||
if (isset($this->cheflieu)) {
|
||||
$this->cheflieu = trim($this->cheflieu);
|
||||
}
|
||||
if (isset($this->active)) {
|
||||
$this->active = trim($this->active);
|
||||
}
|
||||
|
||||
|
||||
// Check parameters
|
||||
// Put here code to add control on parameters values
|
||||
|
||||
// Update request
|
||||
$sql = "UPDATE ".$this->db->prefix()."c_regions SET";
|
||||
$sql .= " code_region=".(isset($this->code_region) ? "'".$this->db->escape($this->code_region)."'" : "null").",";
|
||||
$sql .= " fk_pays=".(isset($this->fk_pays) ? "'".$this->db->escape($this->fk_pays)."'" : "null").",";
|
||||
$sql .= " nom=".(isset($this->name) ? "'".$this->db->escape($this->name)."'" : "null").",";
|
||||
$sql .= " cheflieu=".(isset($this->cheflieu) ? "'".$this->db->escape($this->cheflieu)."'" : "null").",";
|
||||
$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
|
||||
$sql .= " WHERE rowid=".((int) $this->id);
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
dol_syslog(get_class($this)."::update", LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
if (!$resql) {
|
||||
$error++;
|
||||
$this->errors[] = "Error ".$this->db->lasterror();
|
||||
}
|
||||
|
||||
// Commit or rollback
|
||||
if ($error) {
|
||||
foreach ($this->errors as $errmsg) {
|
||||
dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
|
||||
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
|
||||
}
|
||||
$this->db->rollback();
|
||||
return -1 * $error;
|
||||
} else {
|
||||
$this->db->commit();
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Delete object in database
|
||||
*
|
||||
* @param User $user User that delete
|
||||
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
public function delete($user, $notrigger = 0)
|
||||
{
|
||||
global $conf, $langs;
|
||||
$error = 0;
|
||||
|
||||
$sql = "DELETE FROM ".$this->db->prefix()."c_regions";
|
||||
$sql .= " WHERE rowid=".((int) $this->id);
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
|
||||
$resql = $this->db->query($sql);
|
||||
if (!$resql) {
|
||||
$error++;
|
||||
$this->errors[] = "Error ".$this->db->lasterror();
|
||||
}
|
||||
|
||||
// Commit or rollback
|
||||
if ($error) {
|
||||
foreach ($this->errors as $errmsg) {
|
||||
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
|
||||
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
|
||||
}
|
||||
$this->db->rollback();
|
||||
return -1 * $error;
|
||||
} else {
|
||||
$this->db->commit();
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
*
|
||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||
* @param string $option On what the link point to ('nolink', ...)
|
||||
* @param int $notooltip 1=Disable tooltip
|
||||
* @param string $morecss Add more css on link
|
||||
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
|
||||
* @return string String with URL
|
||||
*/
|
||||
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
|
||||
{
|
||||
global $langs;
|
||||
return $langs->trans($this->name);
|
||||
}
|
||||
}
|
||||
|
|
@ -8763,7 +8763,7 @@ class Form
|
|||
<dd class="dropdowndd">
|
||||
<div class="multiselectcheckbox'.$htmlname.'">
|
||||
<ul class="'.$htmlname.($pos == '1' ? 'left' : '').'">
|
||||
<li><input class="inputsearch_dropdownselectedfields width90p minwidth200" style="width:90%;" type="text" placeholder="'.$langs->trans('Search').'"></li>
|
||||
<li><input class="inputsearch_dropdownselectedfields width90p minwidth200imp" style="width:90%;" type="text" placeholder="'.$langs->trans('Search').'"></li>
|
||||
'.$listoffieldsforselection.'
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1123,43 +1123,48 @@ class FormCompany extends Form
|
|||
/**
|
||||
* Output html select to select prospect status
|
||||
*
|
||||
* @param string $htmlname Name of HTML select
|
||||
* @param object $prospectstatic list of status prospect
|
||||
* @param int $statusprospect status of prospect
|
||||
* @param int $idprospect id of prospect
|
||||
* @param string $mode select if we want activate de html part or js
|
||||
* @param string $htmlname Name of HTML select
|
||||
* @param Societe|null $prospectstatic Prospect object
|
||||
* @param int $statusprospect status of prospect
|
||||
* @param int $idprospect id of prospect
|
||||
* @param string $mode select if we want activate de html part or js
|
||||
* @return void
|
||||
*/
|
||||
public function selectStatus($htmlname, $prospectstatic, $statusprospect, $idprospect, $mode = "html")
|
||||
public function selectProspectStatus($htmlname, Societe $prospectstatic, $statusprospect, $idprospect, $mode = "html")
|
||||
{
|
||||
global $langs;
|
||||
|
||||
if ($mode === "html") {
|
||||
print '<select class="flat selectprospectstatus" id="'. $idprospect .'" name="' . $htmlname .'">';
|
||||
|
||||
//print $prospectstatic->LibProspCommStatut($statusprospect, 2, $prospectstatic->cacheprospectstatus[$statusprospect]['label'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto']);
|
||||
print img_action('', $prospectstatic->cacheprospectstatus[$statusprospect]['code'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto'], 'class="inline-block valignmiddle paddingright"');
|
||||
print '<select class="flat selectprospectstatus maxwidth150" id="'. $htmlname.$idprospect .'" data-socid="'.$idprospect.'" name="' . $htmlname .'">';
|
||||
foreach ($prospectstatic->cacheprospectstatus as $key => $val) {
|
||||
$titlealt = 'default';
|
||||
$titlealt = (empty($val['label']) ? 'default' : $val['label']);
|
||||
$label = $val['label'];
|
||||
if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
|
||||
$titlealt = $val['label'];
|
||||
}
|
||||
if ($statusprospect != $val['id']) {
|
||||
print '<option value="'. $val['id'] .'" title="' . $titlealt . '">' . $val['label'] . '</option>';
|
||||
$label = (($langs->trans("StatusProspect".$val['code']) != "StatusProspect".$val['code']) ? $langs->trans("StatusProspect".$val['code']) : $label);
|
||||
} else {
|
||||
print '<option value="' . $val['id'] . '" title="' . $titlealt . '" selected>' . $val['label'] . '</option>';
|
||||
$label = (($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id']) ? $langs->trans("StatusProspect".$val['id']) : $label);
|
||||
}
|
||||
print '<option value="'.$val['id'].'" data-html="'.dol_escape_htmltag(img_action('', $val['code'], $val['picto']).' '.$label).'" title="'.dol_escape_htmltag($label).'"'.($statusprospect == $val['id'] ? ' selected' : '').'>';
|
||||
print dol_escape_htmltag($label);
|
||||
print '</option>';
|
||||
}
|
||||
print '</select>';
|
||||
print ajax_combobox($htmlname);
|
||||
print ajax_combobox($htmlname.$idprospect);
|
||||
} elseif ($mode === "js") {
|
||||
print '<script>
|
||||
jQuery(document).ready(function() {
|
||||
$(".selectprospectstatus").on("change", function() {
|
||||
console.log("We change a value into a field selectprospectstatus");
|
||||
var statusid = $(this).val();
|
||||
var prospectid = $(this).attr("id");
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: \'' . DOL_URL_ROOT . '/core/ajax/ajaxstatusprospect.php\',
|
||||
data: {id: statusid, prospectid: prospectid, token: "'. newToken() .'", action: "updatestatusprospect"},
|
||||
success: function(response) {
|
||||
var prospectid = $(this).attr("data-socid");
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: \'' . DOL_URL_ROOT . '/core/ajax/ajaxstatusprospect.php\',
|
||||
data: { id: statusid, prospectid: prospectid, token: \''. newToken() .'\', action: \'updatestatusprospect\'},
|
||||
success: function(response) {
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -231,6 +231,22 @@ class SMTPs
|
|||
// @CHANGE LDR
|
||||
public $log = '';
|
||||
public $lastretval = '';
|
||||
|
||||
/**
|
||||
* @var resource
|
||||
*/
|
||||
public $socket;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
public $errno;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public $errstr;
|
||||
|
||||
private $_errorsTo = '';
|
||||
private $_deliveryReceipt = 0;
|
||||
private $_trackId = '';
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ function societe_prepare_head(Societe $object)
|
|||
$h++;
|
||||
|
||||
if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
|
||||
if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire) {
|
||||
if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->hasRight('societe', 'contact', 'lire')) {
|
||||
//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
|
||||
$nbContact = 0;
|
||||
// Enable caching of thirdrparty count Contacts
|
||||
|
|
|
|||
|
|
@ -4499,9 +4499,10 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
|
|||
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
|
||||
* Example: picto.png@mymodule if picto.png is stored into htdocs/mymodule/img
|
||||
* Example: /mydir/mysubdir/picto.png if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
|
||||
* @param string $moreatt More attributes
|
||||
* @return string Return an img tag
|
||||
*/
|
||||
function img_action($titlealt, $numaction, $picto = '')
|
||||
function img_action($titlealt, $numaction, $picto = '', $moreatt = '')
|
||||
{
|
||||
global $langs;
|
||||
|
||||
|
|
@ -4530,7 +4531,7 @@ function img_action($titlealt, $numaction, $picto = '')
|
|||
$numaction = 0;
|
||||
}
|
||||
|
||||
return img_picto($titlealt, !empty($picto) ? $picto : 'stcomm'.$numaction.'.png');
|
||||
return img_picto($titlealt, (empty($picto) ? 'stcomm'.$numaction.'.png' : $picto), $moreatt);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -2252,7 +2252,7 @@ class EmailCollector extends CommonObject
|
|||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> Found namealiastouseforthirdparty='.dol_escape_htmltag($namealiastouseforthirdparty);
|
||||
} else {
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> We discard this, not used to search existing thirdparty';
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' Regex /'.dol_escape_htmltag($regexstring).'/ms into '.strtoupper($sourcefield).' -> We discard this, not a field used to search an existing thirdparty';
|
||||
}
|
||||
} else {
|
||||
// Regex not found
|
||||
|
|
@ -2277,19 +2277,19 @@ class EmailCollector extends CommonObject
|
|||
if ($propertytooverwrite == 'id') {
|
||||
$idtouseforthirdparty = $reg[2];
|
||||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.'We set property idtouseforthrdparty='.dol_escape_htmltag($idtouseforthirdparty);
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' We set property idtouseforthrdparty='.dol_escape_htmltag($idtouseforthirdparty);
|
||||
} elseif ($propertytooverwrite == 'email') {
|
||||
$emailtouseforthirdparty = $reg[2];
|
||||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.'We set property emailtouseforthrdparty='.dol_escape_htmltag($emailtouseforthirdparty);
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' We set property emailtouseforthrdparty='.dol_escape_htmltag($emailtouseforthirdparty);
|
||||
} elseif ($propertytooverwrite == 'name') {
|
||||
$nametouseforthirdparty = $reg[2];
|
||||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.'We set property nametouseforthirdparty='.dol_escape_htmltag($nametouseforthirdparty);
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' We set property nametouseforthirdparty='.dol_escape_htmltag($nametouseforthirdparty);
|
||||
} elseif ($propertytooverwrite == 'name_alias') {
|
||||
$namealiastouseforthirdparty = $reg[2];
|
||||
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.'We set property namealiastouseforthirdparty='.dol_escape_htmltag($namealiastouseforthirdparty);
|
||||
$operationslog .= '<br>propertytooverwrite='.$propertytooverwrite.' We set property namealiastouseforthirdparty='.dol_escape_htmltag($namealiastouseforthirdparty);
|
||||
}
|
||||
} else {
|
||||
$errorforactions++;
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ if ($resql) {
|
|||
}
|
||||
}
|
||||
if (!empty($arrayfields['s.nom']['checked'])) {
|
||||
print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
|
||||
print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -411,3 +411,5 @@ CREATE TABLE llx_c_invoice_subtype (
|
|||
|
||||
ALTER TABLE llx_c_invoice_subtype ADD UNIQUE INDEX uk_c_invoice_subtype (entity, code);
|
||||
|
||||
ALTER TABLE llx_c_propalst ADD COLUMN sortorder smallint DEFAULT 0;
|
||||
ALTER TABLE llx_c_stcomm ADD COLUMN sortorder smallint DEFAULT 0;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ create table llx_c_propalst
|
|||
id smallint PRIMARY KEY,
|
||||
code varchar(12) NOT NULL,
|
||||
label varchar(128),
|
||||
sortorder smallint DEFAULT 0,
|
||||
active tinyint DEFAULT 1 NOT NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ create table llx_c_stcomm
|
|||
code varchar(24) NOT NULL,
|
||||
libelle varchar(128),
|
||||
picto varchar(128),
|
||||
sortorder smallint DEFAULT 0,
|
||||
active tinyint default 1 NOT NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
|
|
|||
|
|
@ -2323,8 +2323,8 @@ DefaultOpportunityStatus=Default opportunity status (first status when lead is c
|
|||
|
||||
IconAndText=Icon and text
|
||||
TextOnly=Text only
|
||||
IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
|
||||
IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover the icon
|
||||
IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
|
||||
IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
|
||||
IconOnly=Icon only - Text on tooltip only
|
||||
INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
|
||||
INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ EndSubscription=End of membership
|
|||
SubscriptionId=Contribution ID
|
||||
WithoutSubscription=Without membership
|
||||
WaitingSubscription=Membership pending
|
||||
WaitingSubscriptionShort=Pending
|
||||
MemberId=Member Id
|
||||
MemberRef=Member Ref
|
||||
NewMember=New member
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ if ($action == "view_ticketlist") {
|
|||
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
|
||||
print $hookmanager->resPrint;
|
||||
|
||||
// Status
|
||||
// Status ticket
|
||||
if (!empty($arrayfields['t.fk_statut']['checked'])) {
|
||||
print '<td class="liste_titre">';
|
||||
$selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
|
||||
|
|
|
|||
|
|
@ -674,6 +674,30 @@ class RecruitmentCandidature extends CommonObject
|
|||
return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'RECRUITMENTCANDIDATURE_REOPEN');
|
||||
}
|
||||
|
||||
/**
|
||||
* Return full name ('name+' '+lastname)
|
||||
*
|
||||
* @param Translate $langs Language object for translation of civility (used only if option is 1)
|
||||
* @param int $option 0=No option
|
||||
* @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname
|
||||
* @param int $maxlen Maximum length
|
||||
* @return string String with full name
|
||||
*/
|
||||
public function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)
|
||||
{
|
||||
$lastname = $this->lastname;
|
||||
$firstname = $this->firstname;
|
||||
if (empty($lastname)) {
|
||||
$lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
|
||||
}
|
||||
|
||||
$ret = '';
|
||||
|
||||
$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
|
||||
|
||||
return dol_trunc($ret, $maxlen);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a link to the object card (with optionaly the picto)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -108,10 +108,13 @@ class Client extends Societe
|
|||
{
|
||||
global $langs;
|
||||
|
||||
$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
|
||||
$sql = "SELECT id, code, libelle as label, picto, sortorder";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm";
|
||||
if ($active >= 0) {
|
||||
$sql .= " WHERE active = ".((int) $active);
|
||||
}
|
||||
$sql .= $this->db->order('sortorder,id', 'ASC,ASC');
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
$num = $this->db->num_rows($resql);
|
||||
$i = 0;
|
||||
|
|
|
|||
|
|
@ -4702,49 +4702,50 @@ class Societe extends CommonObject
|
|||
{
|
||||
// phpcs:enable
|
||||
global $langs;
|
||||
|
||||
$langs->load('customers');
|
||||
|
||||
if ($mode == 2) {
|
||||
if ($status == '-1' || $status == 'ST_NO') {
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect-1");
|
||||
} elseif ($status == '0' || $status == 'ST_NEVER') {
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect0");
|
||||
} elseif ($status == '1' || $status == 'ST_TODO') {
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect1");
|
||||
} elseif ($status == '2' || $status == 'ST_PEND') {
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect2");
|
||||
} elseif ($status == '3' || $status == 'ST_DONE') {
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect3");
|
||||
} else {
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto, 'class="inline-block valignmiddle"').' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
|
||||
}
|
||||
} elseif ($mode == 3) {
|
||||
if ($status == '-1' || $status == 'ST_NO') {
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto);
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto, 'class="inline-block valignmiddle"');
|
||||
} elseif ($status == '0' || $status == 'ST_NEVER') {
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto);
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto, 'class="inline-block valignmiddle"');
|
||||
} elseif ($status == '1' || $status == 'ST_TODO') {
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto);
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto, 'class="inline-block valignmiddle"');
|
||||
} elseif ($status == '2' || $status == 'ST_PEND') {
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto);
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto, 'class="inline-block valignmiddle"');
|
||||
} elseif ($status == '3' || $status == 'ST_DONE') {
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto);
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto, 'class="inline-block valignmiddle"');
|
||||
} else {
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto);
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto, 'class="inline-block valignmiddle"');
|
||||
}
|
||||
} elseif ($mode == 4) {
|
||||
if ($status == '-1' || $status == 'ST_NO') {
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
|
||||
return img_action($langs->trans("StatusProspect-1"), -1, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect-1");
|
||||
} elseif ($status == '0' || $status == 'ST_NEVER') {
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
|
||||
return img_action($langs->trans("StatusProspect0"), 0, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect0");
|
||||
} elseif ($status == '1' || $status == 'ST_TODO') {
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
|
||||
return img_action($langs->trans("StatusProspect1"), 1, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect1");
|
||||
} elseif ($status == '2' || $status == 'ST_PEND') {
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
|
||||
return img_action($langs->trans("StatusProspect2"), 2, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect2");
|
||||
} elseif ($status == '3' || $status == 'ST_DONE') {
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
|
||||
return img_action($langs->trans("StatusProspect3"), 3, $picto, 'class="inline-block valignmiddle"').' '.$langs->trans("StatusProspect3");
|
||||
} else {
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
|
||||
return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto, 'class="inline-block valignmiddle"').' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@ if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
|
|||
}
|
||||
|
||||
//if (isModEnabled('agenda') && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
|
||||
$elementTypeArray = array();
|
||||
|
||||
if ($object->client) {
|
||||
print '<tr><td class="titlefield">';
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ if ($result) {
|
|||
if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
|
||||
$found = 1; $third['customer']++;
|
||||
}
|
||||
if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
|
||||
if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
|
||||
$found = 1; $third['supplier']++;
|
||||
}
|
||||
if (isModEnabled('societe') && $objp->client == 0 && $objp->fournisseur == 0) {
|
||||
|
|
@ -156,7 +156,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
|
|||
if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
|
||||
$dataseries[] = array($langs->trans("Customers"), round($third['customer']));
|
||||
}
|
||||
if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
|
||||
if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
|
||||
$dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
|
||||
}
|
||||
if (isModEnabled('societe')) {
|
||||
|
|
|
|||
|
|
@ -996,8 +996,8 @@ if ($contextpage != 'poslist') {
|
|||
$newcardbutton = '';
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->rights->societe->creer);
|
||||
} elseif ($user->rights->societe->creer) {
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->hasRight('societe', 'creer'));
|
||||
} elseif ($user->hasRight('societe', 'creer')) {
|
||||
$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
|
||||
$label = 'MenuNewCustomer';
|
||||
$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
|
||||
|
|
@ -1831,7 +1831,7 @@ while ($i < $imaxinloop) {
|
|||
$prospectid = $obj->rowid;
|
||||
$statusprospect = $obj->stcomm_id;
|
||||
|
||||
$formcompany->selectStatus('status_prospect', $prospectstatic, $statusprospect, $prospectid);
|
||||
$formcompany->selectProspectStatus('status_prospect', $prospectstatic, $statusprospect, $prospectid);
|
||||
|
||||
print '</td>';
|
||||
if (!$i) {
|
||||
|
|
@ -1912,7 +1912,7 @@ while ($i < $imaxinloop) {
|
|||
}
|
||||
|
||||
// Line that calls the select_status function by passing it js as the 5th parameter in order to activate the js script
|
||||
$formcompany->selectStatus('status_prospect', null, null, null, "js");
|
||||
$formcompany->selectProspectStatus('status_prospect', $prospectstatic, null, null, "js");
|
||||
|
||||
// If no record found
|
||||
if ($num == 0) {
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
|||
*/
|
||||
print "\n".'<div class="tabsAction">'."\n";
|
||||
|
||||
if ($user->rights->produit->creer || $user->rights->service->creer) {
|
||||
if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
|
||||
print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=add_customer_price&token='.newToken().'&socid='.$object->id.'">'.$langs->trans("AddCustomerPrice").'</a></div>';
|
||||
}
|
||||
print "\n</div>\n";
|
||||
|
|
@ -639,7 +639,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
|||
}
|
||||
} else {
|
||||
$colspan = 10;
|
||||
if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
|
||||
if ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer')) {
|
||||
$colspan += 1;
|
||||
}
|
||||
print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
|
||||
|
|
|
|||
|
|
@ -1602,7 +1602,7 @@ maxscreenheightless200 {
|
|||
.minwidth50 { min-width: 50px; }
|
||||
.minwidth75 { min-width: 75px; }
|
||||
/* rule for not too small screen only */
|
||||
@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
|
||||
@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
|
||||
{
|
||||
.width20 { width: 20px; }
|
||||
.width25 { width: 25px; }
|
||||
|
|
@ -4663,13 +4663,16 @@ span.dashboardlineko {
|
|||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.boxtable {
|
||||
.divboxtable {
|
||||
margin-bottom: 25px !important;
|
||||
}
|
||||
.boxtable {
|
||||
border-bottom-width: 1px;
|
||||
background: var(--colorbackbody);
|
||||
border-top: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
|
||||
/* border-top: 2px solid var(--colorbackhmenu1) !important; */
|
||||
}
|
||||
|
||||
table.noborder.boxtable tr td {
|
||||
height: unset;
|
||||
}
|
||||
|
|
@ -5036,7 +5039,7 @@ div#card-errors {
|
|||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Formulaire confirmation (When Ajax JQuery is used) */
|
||||
/* Formulaire confirmation (When Ajax JQuery is used) and Dialog popups */
|
||||
/* ============================================================================== */
|
||||
|
||||
.ui-dialog-titlebar {
|
||||
|
|
@ -5044,7 +5047,7 @@ div#card-errors {
|
|||
.ui-dialog-content {
|
||||
}
|
||||
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable {
|
||||
z-index: 1002 !important; /* Default 101 with ui-jquery, top menu have a z-index of 1000 */
|
||||
z-index: 1005 !important; /* Default 101 with ui-jquery, top menu have a z-index of 1000 */
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -6723,6 +6726,7 @@ div.multi-select-menu[role="menu"] {
|
|||
}
|
||||
label.multi-select-menuitem {
|
||||
line-height: 24px;
|
||||
text-align: start;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4706,8 +4706,10 @@ span.dashboardlineko {
|
|||
color: #FFFFFF ! important;
|
||||
border-radius: .25em;
|
||||
}
|
||||
.boxtable {
|
||||
.divboxtable {
|
||||
margin-bottom: 20px !important;
|
||||
}
|
||||
.boxtable {
|
||||
border-bottom-width: 1px;
|
||||
}
|
||||
.boxtablenotop {
|
||||
|
|
@ -5061,7 +5063,7 @@ div#card-errors {
|
|||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Formulaire confirmation (When Ajax JQuery is used) */
|
||||
/* Formulaire confirmation (When Ajax JQuery is used) and Dialog popups */
|
||||
/* ============================================================================== */
|
||||
|
||||
.ui-dialog-titlebar {
|
||||
|
|
@ -5070,7 +5072,7 @@ div#card-errors {
|
|||
font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?> !important;
|
||||
}
|
||||
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable {
|
||||
z-index: 1002 !important; /* Default 101 with ui-jquery, top menu have a z-index of 1000 */
|
||||
z-index: 1005 !important; /* Default 101 with ui-jquery, top menu have a z-index of 1000 */
|
||||
}
|
||||
|
||||
div#dialogforpopup {
|
||||
|
|
@ -6636,6 +6638,7 @@ div.multi-select-menu[role="menu"] {
|
|||
}
|
||||
label.multi-select-menuitem {
|
||||
line-height: 24px;
|
||||
text-align: start;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue