';
@@ -1669,6 +1760,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
$object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
$object->webservices_key = GETPOST('webservices_key', 'san_alpha');
+ $object->accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
+ $object->accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
+
//Incoterms
if (!empty($conf->incoterm->enabled))
{
@@ -2133,17 +2227,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print "";
// Supplier
- print '
'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' ';
- print '';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
- $c = new Categorie($db);
- $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
- $arrayselected = array();
- foreach ($cats as $cat) {
- $arrayselected[] = $cat->id;
+ if (!empty($conf->fournisseur->enabled)) {
+ print ' '.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).' ';
+ print '';
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+ $c = new Categorie($db);
+ $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
+ $arrayselected = array();
+ foreach ($cats as $cat) {
+ $arrayselected[] = $cat->id;
+ }
+ print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+ print " ";
}
- print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
- print "";
}
// Multicurrency
@@ -2196,10 +2292,42 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1);
print '';
+ print '';
+
+ print '
';
+
+ print '
';
+
+ if (! empty($conf->accounting->enabled))
+ {
+ // Accountancy_code_sell
+ print ''.$langs->trans("ProductAccountancySellCode").' ';
+ print '';
+ print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
+ print ' '.$langs->trans("ProductAccountancyBuyCode").' ';
+ print '';
+ print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
+ print ' '.$langs->trans("ProductAccountancySellCode").' ';
+ print ''.$langs->trans("ProductAccountancyBuyCode").' ';
+ print '
';
print '
';
print '
';
@@ -2520,7 +2648,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
}
// Supplier
- if ($object->fournisseur) {
+ if (!empty($conf->fournisseur->enabled) && $object->fournisseur) {
print '
'.$langs->trans("SuppliersCategoriesShort").' ';
print '';
print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
@@ -2577,6 +2705,42 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print ' ';
}
+ // Accountancy sell code
+ print '
';
+ print $langs->trans("ProductAccountancySellCode");
+ print ' ';
+ if (! empty($conf->accounting->enabled))
+ {
+ if (! empty($object->accountancy_code_sell))
+ {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('', $object->accountancy_code_sell, 1);
+
+ print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+ }
+ } else {
+ print $object->accountancy_code_sell;
+ }
+ print ' ';
+
+ // Accountancy buy code
+ print '
';
+ print $langs->trans("ProductAccountancyBuyCode");
+ print ' ';
+ if (! empty($conf->accounting->enabled))
+ {
+ if (! empty($object->accountancy_code_buy))
+ {
+ $accountingaccount2 = new AccountingAccount($db);
+ $accountingaccount2->fetch('', $object->accountancy_code_buy, 1);
+
+ print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
+ }
+ } else {
+ print $object->accountancy_code_buy;
+ }
+ print ' ';
+
// Other attributes
$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 22763134e22..14e2cbe3277 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -693,6 +693,15 @@ class Societe extends CommonObject
*/
public $logo_squarred_mini;
+ /**
+ * @var string Accountancy account for sales
+ */
+ public $accountancy_code_sell;
+
+ /**
+ * @var string Accountancy account for bought
+ */
+ public $accountancy_code_buy;
// Multicurrency
/**
@@ -798,6 +807,9 @@ class Societe extends CommonObject
}
$this->import_key = trim($this->import_key);
+ $this->accountancy_code_buy = trim($this->accountancy_code_buy);
+ $this->accountancy_code_sell= trim($this->accountancy_code_sell);
+
if (!empty($this->multicurrency_code)) {
$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
}
@@ -827,8 +839,24 @@ class Societe extends CommonObject
if ($result >= 0) {
$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
- $sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (";
+ $sql .= "nom";
+ $sql .= ", name_alias";
+ $sql .= ", entity";
+ $sql .= ", datec";
+ $sql .= ", fk_user_creat";
+ $sql .= ", canvas";
+ $sql .= ", status";
+ $sql .= ", ref_ext";
+ $sql .= ", fk_stcomm";
+ $sql .= ", fk_incoterms";
+ $sql .= ", location_incoterms";
+ $sql .= ", import_key";
+ $sql .= ", fk_multicurrency";
+ $sql .= ", multicurrency_code";
+ $sql .= ", accountancy_code_buy";
+ $sql .= ", accountancy_code_sell";
+ $sql .= ") VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
$sql .= ", ".$this->status;
@@ -838,7 +866,10 @@ class Societe extends CommonObject
$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
$sql .= ", ".(int) $this->fk_multicurrency;
- $sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
+ $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+ $sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+ $sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -900,10 +931,18 @@ class Societe extends CommonObject
* Create a contact/address from thirdparty
*
* @param User $user Object user
+ * @param int $no_email 1=Do not send mailing, 0=Ok to recieve mailling
+ * @param array $tags Array of tag to affect to contact
* @return int <0 if KO, >0 if OK
*/
- public function create_individual(User $user)
+ public function create_individual(User $user, $no_email, $tags = array())
{
+ global $conf;
+
+ $error = 0;
+
+ $this->db->begin();
+
// phpcs:enable
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
$contact = new Contact($this->db);
@@ -923,14 +962,43 @@ class Societe extends CommonObject
$contact->town = $this->town;
$contact->phone_pro = $this->phone;
- $result = $contact->create($user);
- if ($result < 0) {
+ $contactId = $contact->create($user);
+ if ($contactId < 0) {
+ $error++;
$this->error = $contact->error;
$this->errors = $contact->errors;
dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
}
- return $result;
+ if (empty($error) && is_array($tags) && !empty($tags)) {
+ $result = $contact->setCategories($tags);
+ if ($result < 0) {
+ $error++;
+ $this->error = $contact->error;
+ $this->errors = array_merge($this->errors, $contact->errors);
+ dol_syslog(get_class($this) . "::create_individual Affect Tag ERROR:" . $this->error, LOG_ERR);
+ $contactId = $result;
+ }
+ }
+
+ if (empty($error) && !empty($conf->mailing->enabled) && !empty($contact->email) && isset($no_email)) {
+ $result = $contact->setNoEmail($no_email);
+ if ($result < 0) {
+ $this->error = $contact->error;
+ $this->errors = array_merge($this->errors, $contact->errors);
+ dol_syslog(get_class($this) . "::create_individual set mailing status ERROR:" . $this->error, LOG_ERR);
+ $contactId = $result;
+ }
+ }
+
+ if (!empty($error)) {
+ dol_syslog(get_class($this)."::create_individual success");
+ $this->db->commit();
+ } else {
+ $this->db->rollback();
+ }
+
+ return $contactId;
}
/**
@@ -1193,6 +1261,9 @@ class Societe extends CommonObject
$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
$this->webservices_key = trim($this->webservices_key);
+ $this->accountancy_code_buy = trim($this->accountancy_code_buy);
+ $this->accountancy_code_sell= trim($this->accountancy_code_sell);
+
//Incoterms
$this->fk_incoterms = (int) $this->fk_incoterms;
$this->location_incoterms = trim($this->location_incoterms);
@@ -1318,6 +1389,9 @@ class Societe extends CommonObject
$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
+ $sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
+ $sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
+
$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
@@ -1489,6 +1563,7 @@ class Societe extends CommonObject
$sql .= ', s.fk_effectif as effectif_id';
$sql .= ', s.fk_forme_juridique as forme_juridique_code';
$sql .= ', s.webservices_url, s.webservices_key';
+ $sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
$sql .= ', s.fk_account, s.tva_assuj';
@@ -1673,6 +1748,9 @@ class Societe extends CommonObject
$this->webservices_url = $obj->webservices_url;
$this->webservices_key = $obj->webservices_key;
+ $this->accountancy_code_buy = $obj->accountancy_code_buy;
+ $this->accountancy_code_sell = $obj->accountancy_code_sell;
+
$this->outstanding_limit = $obj->outstanding_limit;
$this->order_min_amount = $obj->order_min_amount;
$this->supplier_order_min_amount = $obj->supplier_order_min_amount;
@@ -3621,8 +3699,8 @@ class Societe extends CommonObject
*/
public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
{
- // phpcs:enable
- global $user, $langs;
+ // phpcs:enable
+ global $conf, $user, $langs;
dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -3656,6 +3734,23 @@ class Societe extends CommonObject
// Cree et positionne $this->id
$result = $this->create($user);
if ($result >= 0) {
+ // Auto-create contact on thirdparty creation
+ if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT)) {
+ // Fill fields needed by contact
+ $this->name_bis = $member->lastname;
+ $this->firstname = $member->firstname;
+ $this->civility_id = $member->civility_id;
+
+ dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
+ $result = $this->create_individual($user);
+ if ($result < 0)
+ {
+ setEventMessages($this->error, $this->errors, 'errors');
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
$sql .= " SET fk_soc=".$this->id;
$sql .= " WHERE rowid=".$member->id;
@@ -4473,4 +4568,57 @@ class Societe extends CommonObject
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
}
+
+ /**
+ * Sets an accountancy code for a thirdparty.
+ * Also calls COMPANY_MODIFY trigger when modified
+ *
+ * @param string $type It can be only 'buy' or 'sell'
+ * @param string $value Accountancy code
+ * @return int <0 KO >0 OK
+ */
+ public function setAccountancyCode($type, $value)
+ {
+ global $user, $langs, $conf;
+
+ $this->db->begin();
+
+ if ($type == 'buy') {
+ $field = 'accountancy_code_buy';
+ } elseif ($type == 'sell') {
+ $field = 'accountancy_code_sell';
+ } else {
+ return -1;
+ }
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
+ $sql.= "$field = '".$this->db->escape($value)."'";
+ $sql.= " WHERE rowid = ".$this->id;
+
+ dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);
+ $resql = $this->db->query($sql);
+
+ if ($resql) {
+ // Call triggers
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers('COMPANY_MODIFY', $this, $user, $langs, $conf);
+ if ($result < 0) {
+ $this->errors=$interface->errors;
+ $this->db->rollback();
+ return -1;
+ }
+ // End call triggers
+
+ $this->$field = $value;
+
+ $this->db->commit();
+ return 1;
+ }
+ else {
+ $this->error=$this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ }
}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 779bf573341..62301015418 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -148,7 +148,7 @@ if ($object->client)
if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
}
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+if (!empty($conf->ficheinter->enabled) && !empty($user->rights->ficheinter->lire)) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
if ($object->fournisseur)
{
@@ -606,9 +606,10 @@ if ($sql_select)
print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
}
$db->free($resql);
-} elseif (empty($type_element) || $type_element == -1)
+}
+elseif (empty($type_element) || $type_element == -1)
{
- print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+ print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', (!empty($num) ? $num : 0), '', '');
print '
'."\n";
// Titles with sort buttons
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index ee4ca01e7ee..deca82df81a 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -99,7 +99,7 @@ if ($cancel)
$action = '';
}
-$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$parameters = array('id'=>$socid);
$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');
@@ -937,7 +937,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
{
try {
$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
- if ($customerstripe->id) {
+ if (!empty($customerstripe->id)) {
// When using the Charge API architecture
if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 0afe58ece05..dfcfde06c6c 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -88,6 +88,7 @@ if (empty($reshook))
// add price by customer
$prodcustprice->fk_soc = $socid;
+ $prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
$prodcustprice->fk_product = GETPOST('prodid', 'int');
$prodcustprice->price = price2num(GETPOST("price"), 'MU');
$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
@@ -162,6 +163,7 @@ if (empty($reshook))
$update_child_soc = GETPOST('updatechildprice');
// update price by customer
+ $prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
$prodcustprice->price = price2num(GETPOST("price"), 'MU');
$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
@@ -298,6 +300,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
print '';
+ // Ref. Customer
+ print ''.$langs->trans('RefCustomer').' ';
+ print ''.$langs->trans("VATRate").' ';
print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
@@ -376,6 +382,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print " ".$staticprod->getNomUrl(1)." ";
print ''.$langs->trans('RefCustomer').' ';
+ print ''.$langs->trans("VATRate").' ';
print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $staticprod->id, $prodcustprice->recuperableonly);
@@ -465,6 +475,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print ' ';
print ''.$langs->trans("Product").' ';
+ print ''.$langs->trans('RefCustomer').' ';
print ''.$langs->trans("AppliedPricesFrom").' ';
print ''.$langs->trans("PriceBase").' ';
print ''.$langs->trans("VAT").' ';
@@ -482,6 +493,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
$staticprod->fetch($line->fk_product);
print "".$staticprod->getNomUrl(1)." ";
+ print ''.$line->ref_customer.' ';
print "".dol_print_date($line->datec, "dayhour")." ";
print ''.$langs->trans($line->price_base_type)." ";
@@ -551,6 +563,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print ' ';
print ''.$langs->trans("Ref").' ';
print ''.$langs->trans("Product").' ';
+ print ''.$langs->trans('RefCustomer').' ';
print ''.$langs->trans("AppliedPricesFrom").' ';
print ''.$langs->trans("PriceBase").' ';
print ''.$langs->trans("VAT").' ';
@@ -567,7 +580,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print ' ';
print ' ';
+ print ' ';
print ' ';
@@ -590,6 +603,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print "".$staticprod->getNomUrl(1)." ";
print "".$staticprod->label." ";
+ print ''.$line->ref_customer.' ';
print "".dol_print_date($line->datec, "dayhour")." ";
print ''.$langs->trans($line->price_base_type)." ";
@@ -627,7 +641,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print " \n";
}
} else {
- $colspan = 9;
+ $colspan = 10;
if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
print ''.$langs->trans('None').'
+ *
+ * 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 '.$langs->trans("Workstation").' ';
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
+ if (isset($this->status)) {
+ $label .= ''.$langs->trans("Status").": ".$this->getLibStatut(5);
+ }
+
+ $url = dol_buildpath('/workstation/workstation_card.php', 1).'?id='.$this->id;
+
+ if ($option != 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+ }
+
+ $linkclose = '';
+ if (empty($notooltip))
+ {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label = $langs->trans("ShowWorkstation");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+ } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+
+ $linkstart = '';
+ $linkend = ' ';
+
+ $result .= $linkstart;
+
+ if (empty($this->showphoto_on_popup)) {
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'mrp'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ } else {
+ if ($withpicto) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+ list($class, $module) = explode('@', $this->picto);
+ $upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+ $filearray = dol_dir_list($upload_dir, "files");
+ $filename = $filearray[0]['name'];
+ if (!empty($filename)) {
+ $pospoint = strpos($filearray[0]['name'], '.');
+
+ $pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+ if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+ $result .= '';
+ } else {
+ $result .= '
+ *
+ * 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
+ *
+ * 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 '.$nbNote.' ' : '');
+ $head[$h][2] = 'note';
+ $h++;
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+ $upload_dir = $conf->workstation->dir_output."/workstation/".dol_sanitizeFileName($object->ref);
+ $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+ $nbLinks = Link::count($db, $object->element, $object->id);
+ $head[$h][0] = dol_buildpath("/workstation/workstation_document.php", 1).'?id='.$object->id;
+ $head[$h][1] = $langs->trans('Documents');
+ if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).' ';
+ $head[$h][2] = 'document';
+ $h++;
+
+ $head[$h][0] = dol_buildpath("/workstation/workstation_agenda.php", 1).'?id='.$object->id;
+ $head[$h][1] = $langs->trans("Events");
+ $head[$h][2] = 'agenda';
+ $h++;
+
+ // Show more tabs from modules
+ // Entries must be declared in modules descriptor with line
+ //$this->tabs = array(
+ // 'entity:+tabname:Title:@workstation:/workstation/mypage.php?id=__ID__'
+ //); // to add new tab
+ //$this->tabs = array(
+ // 'entity:-tabname:Title:@workstation:/workstation/mypage.php?id=__ID__'
+ //); // to remove a tab
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation@workstation');
+
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation@workstation', 'remove');
+
+ return $head;
+}
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
new file mode 100755
index 00000000000..e2951554488
--- /dev/null
+++ b/htdocs/workstation/workstation_agenda.php
@@ -0,0 +1,276 @@
+
+ * Copyright (C) 2020 Gauthier VERDOL
+ *
+ * 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 '.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ if ($action != 'classify')
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.=' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= ': '.$proj->getNomUrl();
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }*/
+ $morehtmlref .= '
';
+ print '
';
+
+ $object->info($object->id);
+ dol_print_object_info($object, 1);
+
+ print '
trans("AddAnAction"),'filenew');
+ //$out.=" ";
+ }
+
+
+ print '';
+
+ if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+ {
+ $param = '&id='.$object->id.'&socid='.$socid;
+ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+
+
+ //print load_fiche_titre($langs->trans("ActionsOnWorkstation"), '', '');
+
+ // List of all actions
+ $filters = array();
+ $filters['search_agenda_label'] = $search_agenda_label;
+
+ // TODO Replace this with same code than into list.php
+ show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+ }
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
new file mode 100755
index 00000000000..e5d51b20c84
--- /dev/null
+++ b/htdocs/workstation/workstation_card.php
@@ -0,0 +1,504 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 '.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref .= '
'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ //if ($action != 'classify') $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
+ $morehtmlref .= ' : ';
+ if ($action == 'classify') {
+ //$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref .= '
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= ': '.$proj->getNomUrl();
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }*/
+ $morehtmlref .= '
';
+ print '
';
+ print '
';
+ print '
'."\n";
+
+ // Common attributes
+ //$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
+ //unset($object->fields['fk_project']); // Hide field already shown in banner
+ //unset($object->fields['fk_soc']); // Hide field already shown in banner
+ if ($object->type === 'MACHINE') $object->fields['nb_operators_required']['visible'] = 0;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+ // Groups
+ if ($object->type !== 'MACHINE') {
+ $toprint = array();
+ foreach ($object->usergroups as $id_group) {
+ $g = new UserGroup($db);
+ $g->fetch($id_group);
+ $toprint[] = '' . $g->getNomUrl(1) . ' ';
+ }
+ print '' . $langs->trans('Groups') . ' ';
+ print '' . implode(' ', $toprint) . ' ' . $r->getNomUrl(1) . ' ';
+ }
+ print '' . $langs->trans('Machines') . ' ';
+ print '' . implode(' ', $toprint) . '
';
+ print '
';
+ print '
';
+
+ print dol_get_fiche_end();
+
+
+ // Buttons for actions
+
+ if ($action != 'presend' && $action != 'editline') {
+ print ''."\n";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+ if (empty($reshook))
+ {
+ // Modify
+ if ($permissiontoadd) {
+ print '
'.$langs->trans("Modify").' '."\n";
+ } else {
+ print '
'.$langs->trans('Modify').' '."\n";
+ }
+
+ // Clone
+ if ($permissiontoadd) {
+ print '
'.$langs->trans("ToClone").' '."\n";
+ }
+
+
+ if ($permissiontoadd)
+ {
+ if ($object->status == $object::STATUS_ENABLED) {
+ print '
'.$langs->trans("Disable").' '."\n";
+ } else {
+ print '
'.$langs->trans("Enable").' '."\n";
+ }
+ }
+
+
+ // Delete (need delete permission, or if draft, just need create/modify permission)
+ if ($permissiontodelete)
+ {
+ print '
'.$langs->trans('Delete').' '."\n";
+ } else {
+ print '
'.$langs->trans('Delete').' '."\n";
+ }
+ }
+ print '
+ *
+ * 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 '.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ if ($action != 'classify')
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.=' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= ': '.$proj->getNomUrl();
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }*/
+ $morehtmlref .= '
';
+
+ print '
';
+ print '
';
+
+ // Number of files
+ print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
+
+ print '
+ *
+ * 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
+ *
+ * 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 '.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ if ($action != 'classify')
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.=' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= ': '.$proj->getNomUrl();
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }*/
+ $morehtmlref .= '
';
+ print '
';
+
+
+ $cssclass = "titlefield";
+ include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+ print '
assertEquals("Hacker