';
print '' . $langs->trans('NotePrivate') . ' ';
print '';
- $note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
+ $note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc))?$objectsrc->note_private:null));
$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
@@ -1587,7 +1587,7 @@ if ($action == 'create')
if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
{
- print '';
+ print '';
// For backward compatibility
print '';
@@ -1690,7 +1690,15 @@ if ($action == 'create')
//array('type' => 'other','name' => 'note_private', 'label' => $langs->trans("Note"),'value' => ''));
array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"),'value' => $object->note_private));
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetAcceptedRefused'), '', 'setstatut', $formquestion, '', 1, 250);
+ if (! empty($conf->notification->enabled)) {
+ require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+ $notify = new Notify($db);
+ $formquestion = array_merge($formquestion, array(
+ array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
+ ));
+ }
+
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
}
@@ -1757,50 +1765,50 @@ if ($action == 'create')
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->propal->creer, 'string', '', 0, 1);
$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->propal->creer, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.=''.$langs->trans("OtherProposals").' )';
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- 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.='';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
- }
- $morehtmlref.='';
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ 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.='';
+ $morehtmlref.=$proj->ref;
+ $morehtmlref.=' ';
+ } else {
+ $morehtmlref.='';
+ }
+ }
+ }
+ $morehtmlref.='';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
- print '';
- print '
';
- print '
';
+ print '
';
+ print '
';
+ print '
';
print '
';
@@ -1933,24 +1941,24 @@ if ($action == 'create')
print '';
print '';
- // Shipping Method
- if (! empty($conf->expedition->enabled)) {
- print '';
- print '';
- print ' ';
- if ($action == 'editshippingmethod') {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
- } else {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editshippingmethod') {
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+ } else {
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+ }
+ print ' ';
+ print '';
@@ -2046,36 +2054,36 @@ if ($action == 'create')
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && ! empty($conf->banque->enabled))
{
- // Bank Account
- print ' ';
- print '';
- print ' ';
- if ($action == 'editbankaccount') {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
- } else {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editbankaccount') {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+ } else {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+ }
+ print ' ';
+ print '';
- print '';
- print $langs->trans('IncotermLabel');
- print ' ';
- if ($user->rights->propal->creer) print ''.img_edit().' ';
- else print ' ';
- print '
';
- print ' ';
- print '';
+ print '';
+ print $langs->trans('IncotermLabel');
+ print ' ';
+ if ($user->rights->propal->creer) print ''.img_edit().' ';
+ else print ' ';
+ print '
';
+ print ' ';
+ print '';
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -2084,7 +2092,7 @@ if ($action == 'create')
{
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
}
- print ' ';
print '
';
- print '
';
+ print '';
- if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
- {
- // Multicurrency Amount HT
- print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . $langs->trans('AmountHT') . ' ';
@@ -2130,15 +2138,15 @@ if ($action == 'create')
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) // Localtax1
{
- print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
- print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
+ print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
- print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ' ';
+ print '';
+ print '
';
print '
';
if (! empty($object->lines))
@@ -2215,7 +2223,7 @@ if ($action == 'create')
}
print '
';
- print '
';
+ print '
'.$this->labelstatut_short[$statut].' '.img_picto($this->labelstatut[$statut],$statuttrans);
if ($mode == 6) return ''.$this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],$statuttrans);
- }
+ }
- /**
- * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
- *
- * @param User $user Object user
- * @param int $mode "opened" for proposal to close, "signed" for proposal to invoice
- * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
- */
- function load_board($user,$mode)
- {
- global $conf, $langs;
+ /**
+ * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+ *
+ * @param User $user Object user
+ * @param int $mode "opened" for proposal to close, "signed" for proposal to invoice
+ * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+ */
+ function load_board($user,$mode)
+ {
+ global $conf, $langs;
- $clause = " WHERE";
+ $clause = " WHERE";
- $sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
- $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
- {
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
- $clause = " AND";
- }
- $sql.= $clause." p.entity IN (".getEntity('propal').")";
- if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
- if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
- if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
-
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $langs->load("propal");
- $now=dol_now();
-
- if ($mode == 'opened') {
- $delay_warning=$conf->propal->cloture->warning_delay;
- $statut = self::STATUS_VALIDATED;
- $label = $langs->trans("PropalsToClose");
- }
- if ($mode == 'signed') {
- $delay_warning=$conf->propal->facturation->warning_delay;
- $statut = self::STATUS_SIGNED;
- $label = $langs->trans("PropalsToBill"); // We set here bill but may be billed or ordered
- }
-
- $response = new WorkboardResponse();
- $response->warning_delay = $delay_warning/60/60/24;
- $response->label = $label;
- $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
- $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
- $response->img = img_object('',"propal");
-
- // This assignment in condition is not a bug. It allows walking the results.
- while ($obj=$this->db->fetch_object($resql))
- {
- $response->nbtodo++;
- if ($mode == 'opened')
- {
- $datelimit = $this->db->jdate($obj->datefin);
- if ($datelimit < ($now - $delay_warning))
- {
- $response->nbtodolate++;
- }
- }
- // TODO Definir regle des propales a facturer en retard
- // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
- }
-
- return $response;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }
- }
-
-
- /**
- * Initialise an instance with random values.
- * Used to build previews or test instances.
- * id must be 0 if object instance is a specimen.
- *
- * @return void
- */
- function initAsSpecimen()
- {
- global $langs;
-
- // Load array of products prodids
- $num_prods = 0;
- $prodids = array();
- $sql = "SELECT rowid";
- $sql.= " FROM ".MAIN_DB_PREFIX."product";
- $sql.= " WHERE entity IN (".getEntity('product').")";
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num_prods = $this->db->num_rows($resql);
- $i = 0;
- while ($i < $num_prods)
- {
- $i++;
- $row = $this->db->fetch_row($resql);
- $prodids[$i] = $row[0];
- }
- }
-
- // Initialise parametres
- $this->id=0;
- $this->ref = 'SPECIMEN';
- $this->ref_client='NEMICEPS';
- $this->specimen=1;
- $this->socid = 1;
- $this->date = time();
- $this->fin_validite = $this->date+3600*24*30;
- $this->cond_reglement_id = 1;
- $this->cond_reglement_code = 'RECEP';
- $this->mode_reglement_id = 7;
- $this->mode_reglement_code = 'CHQ';
- $this->availability_id = 1;
- $this->availability_code = 'AV_NOW';
- $this->demand_reason_id = 1;
- $this->demand_reason_code = 'SRC_00';
- $this->note_public='This is a comment (public)';
- $this->note_private='This is a comment (private)';
- // Lines
- $nbp = 5;
- $xnbp = 0;
- while ($xnbp < $nbp)
- {
- $line=new PropaleLigne($this->db);
- $line->desc=$langs->trans("Description")." ".$xnbp;
- $line->qty=1;
- $line->subprice=100;
- $line->price=100;
- $line->tva_tx=20;
- $line->localtax1_tx=0;
- $line->localtax2_tx=0;
- if ($xnbp == 2)
- {
- $line->total_ht=50;
- $line->total_ttc=60;
- $line->total_tva=10;
- $line->remise_percent=50;
- }
- else
- {
- $line->total_ht=100;
- $line->total_ttc=120;
- $line->total_tva=20;
- $line->remise_percent=00;
- }
-
- if ($num_prods > 0)
- {
- $prodid = mt_rand(1, $num_prods);
- $line->fk_product=$prodids[$prodid];
- $line->product_ref='SPECIMEN';
- }
-
- $this->lines[$xnbp]=$line;
-
- $this->total_ht += $line->total_ht;
- $this->total_tva += $line->total_tva;
- $this->total_ttc += $line->total_ttc;
-
- $xnbp++;
- }
- }
-
- /**
- * Charge indicateurs this->nb de tableau de bord
- *
- * @return int <0 if ko, >0 if ok
- */
- function load_state_board()
- {
- global $user;
-
- $this->nb=array();
- $clause = "WHERE";
-
- $sql = "SELECT count(p.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
- if (!$user->rights->societe->client->voir && !$user->societe_id)
- {
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
- $clause = "AND";
- }
- $sql.= " ".$clause." p.entity IN (".getEntity('propal').")";
-
- $resql=$this->db->query($sql);
- if ($resql)
- {
- // This assignment in condition is not a bug. It allows walking the results.
- while ($obj=$this->db->fetch_object($resql))
- {
- $this->nb["proposals"]=$obj->nb;
- }
- $this->db->free($resql);
- return 1;
- }
- else
- {
- dol_print_error($this->db);
- $this->error=$this->db->error();
- return -1;
- }
- }
-
-
- /**
- * Returns the reference to the following non used Proposal used depending on the active numbering module
- * defined into PROPALE_ADDON
- *
- * @param Societe $soc Object thirdparty
- * @return string Reference libre pour la propale
- */
- function getNextNumRef($soc)
- {
- global $conf,$langs;
- $langs->load("propal");
-
- if (! empty($conf->global->PROPALE_ADDON))
- {
- $mybool=false;
-
- $file = $conf->global->PROPALE_ADDON.".php";
- $classname = $conf->global->PROPALE_ADDON;
-
- // Include file with class
- $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
- foreach ($dirmodels as $reldir) {
-
- $dir = dol_buildpath($reldir."core/modules/propale/");
-
- // Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
- }
-
- if (! $mybool)
- {
- dol_print_error('',"Failed to include file ".$file);
- return '';
- }
-
- $obj = new $classname();
- $numref = "";
- $numref = $obj->getNextValue($soc,$this);
-
- if ($numref != "")
- {
- return $numref;
- }
- else
- {
- $this->error=$obj->error;
- //dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
- return "";
- }
- }
- else
+ $sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin";
+ $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+ if (!$user->rights->societe->client->voir && !$user->societe_id)
{
- $langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
- return "";
- }
- }
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+ $sql.= " WHERE sc.fk_user = " .$user->id;
+ $clause = " AND";
+ }
+ $sql.= $clause." p.entity IN (".getEntity('propal').")";
+ if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+ if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED;
+ if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id;
- /**
- * Return clicable link of object (with eventually picto)
- *
- * @param int $withpicto Add picto into link
- * @param string $option Where point the link ('expedition', 'document', ...)
- * @param string $get_params Parametres added to url
- * @param int $notooltip 1=Disable tooltip
- * @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
- */
- function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
- {
- global $langs, $conf, $user;
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $langs->load("propal");
+ $now=dol_now();
- if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+ if ($mode == 'opened') {
+ $delay_warning=$conf->propal->cloture->warning_delay;
+ $statut = self::STATUS_VALIDATED;
+ $label = $langs->trans("PropalsToClose");
+ }
+ if ($mode == 'signed') {
+ $delay_warning=$conf->propal->facturation->warning_delay;
+ $statut = self::STATUS_SIGNED;
+ $label = $langs->trans("PropalsToBill"); // We set here bill but may be billed or ordered
+ }
- $result='';
- $label='';
- $url='';
+ $response = new WorkboardResponse();
+ $response->warning_delay = $delay_warning/60/60/24;
+ $response->label = $label;
+ $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
+ $response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
+ $response->img = img_object('',"propal");
- if ($user->rights->propal->lire)
- {
- $label = '' . $langs->trans("ShowPropal") . ' ';
- if (! empty($this->ref))
- $label.= ''.$langs->trans('Ref').': '.$this->ref;
- if (! empty($this->ref_client))
- $label.= ''.$langs->trans('RefCustomer').': '.$this->ref_client;
- if (! empty($this->total_ht))
- $label.= '' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
- if (! empty($this->total_tva))
- $label.= '' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
- if (! empty($this->total_ttc))
- $label.= '' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
- if ($option == '') {
- $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
- }
- if ($option == 'compta') { // deprecated
- $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
- }
- if ($option == 'expedition') {
- $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params;
- }
- if ($option == 'document') {
- $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
- }
+ // This assignment in condition is not a bug. It allows walking the results.
+ while ($obj=$this->db->fetch_object($resql))
+ {
+ $response->nbtodo++;
+ if ($mode == 'opened')
+ {
+ $datelimit = $this->db->jdate($obj->datefin);
+ if ($datelimit < ($now - $delay_warning))
+ {
+ $response->nbtodolate++;
+ }
+ }
+ // TODO Definir regle des propales a facturer en retard
+ // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
+ }
- 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';
- }
- }
+ return $response;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
- $linkclose='';
- if (empty($notooltip) && $user->rights->propal->lire)
- {
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
- $label=$langs->trans("ShowPropal");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
- }
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip"';
- }
- $linkstart = '';
- $linkend=' ';
+ /**
+ * Initialise an instance with random values.
+ * Used to build previews or test instances.
+ * id must be 0 if object instance is a specimen.
+ *
+ * @return void
+ */
+ function initAsSpecimen()
+ {
+ global $langs;
- if ($withpicto)
- $result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
- if ($withpicto && $withpicto != 2)
- $result.=' ';
- $result.=$linkstart.$this->ref.$linkend;
- return $result;
- }
+ // Load array of products prodids
+ $num_prods = 0;
+ $prodids = array();
+ $sql = "SELECT rowid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."product";
+ $sql.= " WHERE entity IN (".getEntity('product').")";
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $num_prods = $this->db->num_rows($resql);
+ $i = 0;
+ while ($i < $num_prods)
+ {
+ $i++;
+ $row = $this->db->fetch_row($resql);
+ $prodids[$i] = $row[0];
+ }
+ }
- /**
- * Retrieve an array of propal lines
+ // Initialise parametres
+ $this->id=0;
+ $this->ref = 'SPECIMEN';
+ $this->ref_client='NEMICEPS';
+ $this->specimen=1;
+ $this->socid = 1;
+ $this->date = time();
+ $this->fin_validite = $this->date+3600*24*30;
+ $this->cond_reglement_id = 1;
+ $this->cond_reglement_code = 'RECEP';
+ $this->mode_reglement_id = 7;
+ $this->mode_reglement_code = 'CHQ';
+ $this->availability_id = 1;
+ $this->availability_code = 'AV_NOW';
+ $this->demand_reason_id = 1;
+ $this->demand_reason_code = 'SRC_00';
+ $this->note_public='This is a comment (public)';
+ $this->note_private='This is a comment (private)';
+ // Lines
+ $nbp = 5;
+ $xnbp = 0;
+ while ($xnbp < $nbp)
+ {
+ $line=new PropaleLigne($this->db);
+ $line->desc=$langs->trans("Description")." ".$xnbp;
+ $line->qty=1;
+ $line->subprice=100;
+ $line->price=100;
+ $line->tva_tx=20;
+ $line->localtax1_tx=0;
+ $line->localtax2_tx=0;
+ if ($xnbp == 2)
+ {
+ $line->total_ht=50;
+ $line->total_ttc=60;
+ $line->total_tva=10;
+ $line->remise_percent=50;
+ }
+ else
+ {
+ $line->total_ht=100;
+ $line->total_ttc=120;
+ $line->total_tva=20;
+ $line->remise_percent=00;
+ }
+
+ if ($num_prods > 0)
+ {
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product=$prodids[$prodid];
+ $line->product_ref='SPECIMEN';
+ }
+
+ $this->lines[$xnbp]=$line;
+
+ $this->total_ht += $line->total_ht;
+ $this->total_tva += $line->total_tva;
+ $this->total_ttc += $line->total_ttc;
+
+ $xnbp++;
+ }
+ }
+
+ /**
+ * Charge indicateurs this->nb de tableau de bord
+ *
+ * @return int <0 if ko, >0 if ok
+ */
+ function load_state_board()
+ {
+ global $user;
+
+ $this->nb=array();
+ $clause = "WHERE";
+
+ $sql = "SELECT count(p.rowid) as nb";
+ $sql.= " FROM ".MAIN_DB_PREFIX."propal as p";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+ if (!$user->rights->societe->client->voir && !$user->societe_id)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql.= " WHERE sc.fk_user = " .$user->id;
+ $clause = "AND";
+ }
+ $sql.= " ".$clause." p.entity IN (".getEntity('propal').")";
+
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ // This assignment in condition is not a bug. It allows walking the results.
+ while ($obj=$this->db->fetch_object($resql))
+ {
+ $this->nb["proposals"]=$obj->nb;
+ }
+ $this->db->free($resql);
+ return 1;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Returns the reference to the following non used Proposal used depending on the active numbering module
+ * defined into PROPALE_ADDON
+ *
+ * @param Societe $soc Object thirdparty
+ * @return string Reference libre pour la propale
+ */
+ function getNextNumRef($soc)
+ {
+ global $conf,$langs;
+ $langs->load("propal");
+
+ if (! empty($conf->global->PROPALE_ADDON))
+ {
+ $mybool=false;
+
+ $file = $conf->global->PROPALE_ADDON.".php";
+ $classname = $conf->global->PROPALE_ADDON;
+
+ // Include file with class
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/propale/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
+
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
+
+ $obj = new $classname();
+ $numref = "";
+ $numref = $obj->getNextValue($soc,$this);
+
+ if ($numref != "")
+ {
+ return $numref;
+ }
+ else
+ {
+ $this->error=$obj->error;
+ //dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
+ return "";
+ }
+ }
+ else
+ {
+ $langs->load("errors");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ return "";
+ }
+ }
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param int $withpicto Add picto into link
+ * @param string $option Where point the link ('expedition', 'document', ...)
+ * @param string $get_params Parametres added to url
+ * @param int $notooltip 1=Disable tooltip
+ * @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
+ */
+ function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
+ {
+ global $langs, $conf, $user;
+
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+
+ $result='';
+ $label='';
+ $url='';
+
+ if ($user->rights->propal->lire)
+ {
+ $label = '' . $langs->trans("ShowPropal") . ' ';
+ if (! empty($this->ref))
+ $label.= ''.$langs->trans('Ref').': '.$this->ref;
+ if (! empty($this->ref_client))
+ $label.= ''.$langs->trans('RefCustomer').': '.$this->ref_client;
+ if (! empty($this->total_ht))
+ $label.= '' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+ if (! empty($this->total_tva))
+ $label.= '' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+ if (! empty($this->total_ttc))
+ $label.= '' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+ if ($option == '') {
+ $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
+ }
+ if ($option == 'compta') { // deprecated
+ $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id. $get_params;
+ }
+ if ($option == 'expedition') {
+ $url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params;
+ }
+ if ($option == 'document') {
+ $url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id. $get_params;
+ }
+
+ 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) && $user->rights->propal->lire)
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowPropal");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip"';
+ }
+
+ $linkstart = '';
+ $linkend=' ';
+
+ if ($withpicto)
+ $result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+ if ($withpicto && $withpicto != 2)
+ $result.=' ';
+ $result.=$linkstart.$this->ref.$linkend;
+ return $result;
+ }
+
+ /**
+ * Retrieve an array of propal lines
*
* @return int >0 if OK, <0 if KO
- */
- function getLinesArray()
- {
- // TODO Duplicate with fetch_lines ? Wich one to keep ?
+ */
+ function getLinesArray()
+ {
+ // TODO Duplicate with fetch_lines ? Wich one to keep ?
- $this->lines = array();
+ $this->lines = array();
- $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
- $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
- $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
- $sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
- $sql.= ' pt.fk_unit,';
- $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
- $sql.= ' p.entity,';
+ $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
+ $sql.= ' pt.qty, pt.vat_src_code, pt.tva_tx, pt.localtax1_tx, pt.localtax2_tx, pt.localtax1_type, pt.localtax2_type, pt.remise_percent, pt.subprice, pt.info_bits,';
+ $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.total_localtax1, pt.total_localtax2, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code,';
+ $sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,';
+ $sql.= ' pt.fk_unit,';
+ $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.description as product_desc, p.tobatch as product_tobatch,';
+ $sql.= ' p.entity,';
$sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
- $sql.= ' WHERE pt.fk_propal = '.$this->id;
- $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+ $sql.= ' WHERE pt.fk_propal = '.$this->id;
+ $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
- dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
+ dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $num = $this->db->num_rows($resql);
+ $i = 0;
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->lines[$i] = new PropaleLigne($this->db);
- $this->lines[$i]->id = $obj->rowid; // for backward compatibility
- $this->lines[$i]->rowid = $obj->rowid;
- $this->lines[$i]->label = $obj->custom_label;
- $this->lines[$i]->desc = $obj->description;
- $this->lines[$i]->description = $obj->description;
- $this->lines[$i]->fk_product = $obj->fk_product;
- $this->lines[$i]->ref = $obj->ref;
- $this->lines[$i]->product_ref = $obj->ref;
- $this->lines[$i]->entity = $obj->entity; // Product entity
- $this->lines[$i]->product_label = $obj->product_label;
- $this->lines[$i]->product_desc = $obj->product_desc;
- $this->lines[$i]->product_tobatch = $obj->product_tobatch;
- $this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
- $this->lines[$i]->product_type = $obj->product_type;
- $this->lines[$i]->qty = $obj->qty;
- $this->lines[$i]->subprice = $obj->subprice;
- $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
- $this->lines[$i]->remise_percent = $obj->remise_percent;
+ $this->lines[$i] = new PropaleLigne($this->db);
+ $this->lines[$i]->id = $obj->rowid; // for backward compatibility
+ $this->lines[$i]->rowid = $obj->rowid;
+ $this->lines[$i]->label = $obj->custom_label;
+ $this->lines[$i]->desc = $obj->description;
+ $this->lines[$i]->description = $obj->description;
+ $this->lines[$i]->fk_product = $obj->fk_product;
+ $this->lines[$i]->ref = $obj->ref;
+ $this->lines[$i]->product_ref = $obj->ref;
+ $this->lines[$i]->entity = $obj->entity; // Product entity
+ $this->lines[$i]->product_label = $obj->product_label;
+ $this->lines[$i]->product_desc = $obj->product_desc;
+ $this->lines[$i]->product_tobatch = $obj->product_tobatch;
+ $this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
+ $this->lines[$i]->product_type = $obj->product_type;
+ $this->lines[$i]->qty = $obj->qty;
+ $this->lines[$i]->subprice = $obj->subprice;
+ $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
+ $this->lines[$i]->remise_percent = $obj->remise_percent;
- $this->lines[$i]->vat_src_code = $obj->vat_src_code;
- $this->lines[$i]->tva_tx = $obj->tva_tx;
- $this->lines[$i]->localtax1_tx = $obj->localtax1_tx;
- $this->lines[$i]->localtax2_tx = $obj->localtax2_tx;
- $this->lines[$i]->localtax1_type = $obj->localtax1_type;
- $this->lines[$i]->localtax2_type = $obj->localtax2_type;
- $this->lines[$i]->info_bits = $obj->info_bits;
- $this->lines[$i]->total_ht = $obj->total_ht;
- $this->lines[$i]->total_tva = $obj->total_tva;
- $this->lines[$i]->total_ttc = $obj->total_ttc;
- $this->lines[$i]->total_localtax1 = $obj->total_localtax1;
- $this->lines[$i]->total_localtax2 = $obj->total_localtax2;
- $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
+ $this->lines[$i]->vat_src_code = $obj->vat_src_code;
+ $this->lines[$i]->tva_tx = $obj->tva_tx;
+ $this->lines[$i]->localtax1_tx = $obj->localtax1_tx;
+ $this->lines[$i]->localtax2_tx = $obj->localtax2_tx;
+ $this->lines[$i]->localtax1_type = $obj->localtax1_type;
+ $this->lines[$i]->localtax2_type = $obj->localtax2_type;
+ $this->lines[$i]->info_bits = $obj->info_bits;
+ $this->lines[$i]->total_ht = $obj->total_ht;
+ $this->lines[$i]->total_tva = $obj->total_tva;
+ $this->lines[$i]->total_ttc = $obj->total_ttc;
+ $this->lines[$i]->total_localtax1 = $obj->total_localtax1;
+ $this->lines[$i]->total_localtax2 = $obj->total_localtax2;
+ $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
$this->lines[$i]->pa_ht = $marginInfos[0];
$this->lines[$i]->marge_tx = $marginInfos[1];
$this->lines[$i]->marque_tx = $marginInfos[2];
$this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
- $this->lines[$i]->special_code = $obj->special_code;
- $this->lines[$i]->rang = $obj->rang;
- $this->lines[$i]->date_start = $this->db->jdate($obj->date_start);
- $this->lines[$i]->date_end = $this->db->jdate($obj->date_end);
- $this->lines[$i]->fk_unit = $obj->fk_unit;
+ $this->lines[$i]->special_code = $obj->special_code;
+ $this->lines[$i]->rang = $obj->rang;
+ $this->lines[$i]->date_start = $this->db->jdate($obj->date_start);
+ $this->lines[$i]->date_end = $this->db->jdate($obj->date_end);
+ $this->lines[$i]->fk_unit = $obj->fk_unit;
// Multicurrency
$this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
@@ -3443,18 +3444,18 @@ class Propal extends CommonObject
$this->lines[$i]->multicurrency_total_tva = $obj->multicurrency_total_tva;
$this->lines[$i]->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
- $i++;
- }
- $this->db->free($resql);
+ $i++;
+ }
+ $this->db->free($resql);
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }
- }
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
/**
* Create a document onto disk according to template module.
@@ -3512,16 +3513,16 @@ class Propal extends CommonObject
*/
class PropaleLigne extends CommonObjectLine
{
- public $element='propaldet';
- public $table_element='propaldet';
+ public $element='propaldet';
+ public $table_element='propaldet';
- var $oldline;
+ var $oldline;
- // From llx_propaldet
- var $fk_propal;
- var $fk_parent_line;
- var $desc; // Description ligne
- var $fk_product; // Id produit predefini
+ // From llx_propaldet
+ var $fk_propal;
+ var $fk_parent_line;
+ var $desc; // Description ligne
+ var $fk_product; // Id produit predefini
/**
* @deprecated
* @see product_type
@@ -3532,51 +3533,51 @@ class PropaleLigne extends CommonObjectLine
* @var int
* @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
*/
- var $product_type = Product::TYPE_PRODUCT;
+ var $product_type = Product::TYPE_PRODUCT;
- var $qty;
- var $tva_tx;
- var $subprice;
- var $remise_percent;
- var $fk_remise_except;
+ var $qty;
+ var $tva_tx;
+ var $subprice;
+ var $remise_percent;
+ var $fk_remise_except;
- var $rang = 0;
+ var $rang = 0;
var $fk_fournprice;
var $pa_ht;
var $marge_tx;
var $marque_tx;
- var $special_code; // Tag for special lines (exlusive tags)
- // 1: frais de port
- // 2: ecotaxe
- // 3: option line (when qty = 0)
+ var $special_code; // Tag for special lines (exlusive tags)
+ // 1: frais de port
+ // 2: ecotaxe
+ // 3: option line (when qty = 0)
- var $info_bits = 0; // Liste d'options cumulables:
- // Bit 0: 0 si TVA normal - 1 si TVA NPR
- // Bit 1: 0 ligne normale - 1 si ligne de remise fixe
+ var $info_bits = 0; // Liste d'options cumulables:
+ // Bit 0: 0 si TVA normal - 1 si TVA NPR
+ // Bit 1: 0 ligne normale - 1 si ligne de remise fixe
- var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
- var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
- var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
+ var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne
+ var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
+ var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
/**
* @deprecated
* @see $remise_percent, $fk_remise_except
*/
- var $remise;
+ var $remise;
/**
* @deprecated
* @see subprice
*/
- var $price;
+ var $price;
- // From llx_product
+ // From llx_product
/**
* @deprecated
* @see product_ref
*/
- var $ref;
+ var $ref;
/**
* Product reference
* @var string
@@ -3586,7 +3587,7 @@ class PropaleLigne extends CommonObjectLine
* @deprecated
* @see product_label
*/
- var $libelle;
+ var $libelle;
/**
* Product label
* @var string
@@ -3596,21 +3597,21 @@ class PropaleLigne extends CommonObjectLine
* Product description
* @var string
*/
- public $product_desc;
+ public $product_desc;
- var $localtax1_tx; // Local tax 1
- var $localtax2_tx; // Local tax 2
- var $localtax1_type; // Local tax 1 type
+ var $localtax1_tx; // Local tax 1
+ var $localtax2_tx; // Local tax 2
+ var $localtax1_type; // Local tax 1 type
var $localtax2_type; // Local tax 2 type
- var $total_localtax1; // Line total local tax 1
- var $total_localtax2; // Line total local tax 2
+ var $total_localtax1; // Line total local tax 1
+ var $total_localtax2; // Line total local tax 2
- var $date_start;
- var $date_end;
+ var $date_start;
+ var $date_end;
- var $skip_update_total; // Skip update price total for special lines
+ var $skip_update_total; // Skip update price total for special lines
- // Multicurrency
+ // Multicurrency
var $fk_multicurrency;
var $multicurrency_code;
var $multicurrency_subprice;
@@ -3618,22 +3619,22 @@ class PropaleLigne extends CommonObjectLine
var $multicurrency_total_tva;
var $multicurrency_total_ttc;
- /**
- * Class line Contructor
- *
- * @param DoliDB $db Database handler
- */
- function __construct($db)
- {
- $this->db= $db;
- }
+ /**
+ * Class line Contructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db= $db;
+ }
- /**
- * Retrieve the propal line object
- *
- * @param int $rowid Propal line id
- * @return int <0 if KO, >0 if OK
- */
+ /**
+ * Retrieve the propal line object
+ *
+ * @param int $rowid Propal line id
+ * @return int <0 if KO, >0 if OK
+ */
function fetch($rowid)
{
$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
@@ -3653,59 +3654,66 @@ class PropaleLigne extends CommonObjectLine
{
$objp = $this->db->fetch_object($result);
- $this->id = $objp->rowid;
- $this->rowid = $objp->rowid; // deprecated
- $this->fk_propal = $objp->fk_propal;
- $this->fk_parent_line = $objp->fk_parent_line;
- $this->label = $objp->custom_label;
- $this->desc = $objp->description;
- $this->qty = $objp->qty;
- $this->price = $objp->price; // deprecated
- $this->subprice = $objp->subprice;
- $this->vat_src_code = $objp->vat_src_code;
- $this->tva_tx = $objp->tva_tx;
- $this->remise = $objp->remise; // deprecated
- $this->remise_percent = $objp->remise_percent;
- $this->fk_remise_except = $objp->fk_remise_except;
- $this->fk_product = $objp->fk_product;
- $this->info_bits = $objp->info_bits;
+ if ($objp)
+ {
+ $this->id = $objp->rowid;
+ $this->rowid = $objp->rowid; // deprecated
+ $this->fk_propal = $objp->fk_propal;
+ $this->fk_parent_line = $objp->fk_parent_line;
+ $this->label = $objp->custom_label;
+ $this->desc = $objp->description;
+ $this->qty = $objp->qty;
+ $this->price = $objp->price; // deprecated
+ $this->subprice = $objp->subprice;
+ $this->vat_src_code = $objp->vat_src_code;
+ $this->tva_tx = $objp->tva_tx;
+ $this->remise = $objp->remise; // deprecated
+ $this->remise_percent = $objp->remise_percent;
+ $this->fk_remise_except = $objp->fk_remise_except;
+ $this->fk_product = $objp->fk_product;
+ $this->info_bits = $objp->info_bits;
- $this->total_ht = $objp->total_ht;
- $this->total_tva = $objp->total_tva;
- $this->total_ttc = $objp->total_ttc;
+ $this->total_ht = $objp->total_ht;
+ $this->total_tva = $objp->total_tva;
+ $this->total_ttc = $objp->total_ttc;
- $this->fk_fournprice = $objp->fk_fournprice;
+ $this->fk_fournprice = $objp->fk_fournprice;
- $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
- $this->pa_ht = $marginInfos[0];
- $this->marge_tx = $marginInfos[1];
- $this->marque_tx = $marginInfos[2];
+ $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
+ $this->pa_ht = $marginInfos[0];
+ $this->marge_tx = $marginInfos[1];
+ $this->marque_tx = $marginInfos[2];
- $this->special_code = $objp->special_code;
- $this->product_type = $objp->product_type;
- $this->rang = $objp->rang;
+ $this->special_code = $objp->special_code;
+ $this->product_type = $objp->product_type;
+ $this->rang = $objp->rang;
- $this->ref = $objp->product_ref; // deprecated
- $this->product_ref = $objp->product_ref;
- $this->libelle = $objp->product_label; // deprecated
- $this->product_label = $objp->product_label;
- $this->product_desc = $objp->product_desc;
- $this->fk_unit = $objp->fk_unit;
+ $this->ref = $objp->product_ref; // deprecated
+ $this->product_ref = $objp->product_ref;
+ $this->libelle = $objp->product_label; // deprecated
+ $this->product_label = $objp->product_label;
+ $this->product_desc = $objp->product_desc;
+ $this->fk_unit = $objp->fk_unit;
- $this->date_start = $this->db->jdate($objp->date_start);
- $this->date_end = $this->db->jdate($objp->date_end);
+ $this->date_start = $this->db->jdate($objp->date_start);
+ $this->date_end = $this->db->jdate($objp->date_end);
- // Multicurrency
- $this->fk_multicurrency = $objp->fk_multicurrency;
- $this->multicurrency_code = $objp->multicurrency_code;
- $this->multicurrency_subprice = $objp->multicurrency_subprice;
- $this->multicurrency_total_ht = $objp->multicurrency_total_ht;
- $this->multicurrency_total_tva = $objp->multicurrency_total_tva;
- $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+ // Multicurrency
+ $this->fk_multicurrency = $objp->fk_multicurrency;
+ $this->multicurrency_code = $objp->multicurrency_code;
+ $this->multicurrency_subprice = $objp->multicurrency_subprice;
+ $this->multicurrency_total_ht = $objp->multicurrency_total_ht;
+ $this->multicurrency_total_tva = $objp->multicurrency_total_tva;
+ $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
- $this->db->free($result);
+ $this->db->free($result);
- return 1;
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
}
else
{
@@ -3713,45 +3721,45 @@ class PropaleLigne extends CommonObjectLine
}
}
- /**
- * Insert object line propal in database
- *
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if KO, >0 if OK
- */
- function insert($notrigger=0)
- {
- global $conf,$user;
+ /**
+ * Insert object line propal in database
+ *
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function insert($notrigger=0)
+ {
+ global $conf,$user;
- $error=0;
+ $error=0;
- dol_syslog(get_class($this)."::insert rang=".$this->rang);
+ dol_syslog(get_class($this)."::insert rang=".$this->rang);
- $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+ $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
- // Clean parameters
- if (empty($this->tva_tx)) $this->tva_tx=0;
- if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
- if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
- if (empty($this->localtax1_type)) $this->localtax1_type=0;
+ // Clean parameters
+ if (empty($this->tva_tx)) $this->tva_tx=0;
+ if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+ if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+ if (empty($this->localtax1_type)) $this->localtax1_type=0;
if (empty($this->localtax2_type)) $this->localtax2_type=0;
- if (empty($this->total_localtax1)) $this->total_localtax1=0;
- if (empty($this->total_localtax2)) $this->total_localtax2=0;
- if (empty($this->rang)) $this->rang=0;
- if (empty($this->remise)) $this->remise=0;
- if (empty($this->remise_percent) || ! is_numeric($this->remise_percent)) $this->remise_percent=0;
- if (empty($this->info_bits)) $this->info_bits=0;
- if (empty($this->special_code)) $this->special_code=0;
- if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
- if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+ if (empty($this->total_localtax1)) $this->total_localtax1=0;
+ if (empty($this->total_localtax2)) $this->total_localtax2=0;
+ if (empty($this->rang)) $this->rang=0;
+ if (empty($this->remise)) $this->remise=0;
+ if (empty($this->remise_percent) || ! is_numeric($this->remise_percent)) $this->remise_percent=0;
+ if (empty($this->info_bits)) $this->info_bits=0;
+ if (empty($this->special_code)) $this->special_code=0;
+ if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+ if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
if (! is_numeric($this->qty)) $this->qty = 0;
- if (empty($this->pa_ht)) $this->pa_ht=0;
- if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
- if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
- if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
- if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+ if (empty($this->pa_ht)) $this->pa_ht=0;
+ if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
+ if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
+ if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
+ if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
- // if buy price not defined, define buyprice as configured in margin admin
+ // if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0 && $pa_ht_isemptystring)
{
if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
@@ -3764,183 +3772,183 @@ class PropaleLigne extends CommonObjectLine
}
}
- // Check parameters
- if ($this->product_type < 0) return -1;
+ // Check parameters
+ if ($this->product_type < 0) return -1;
- $this->db->begin();
+ $this->db->begin();
- // Insert line into database
- $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
- $sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
+ // Insert line into database
+ $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
+ $sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
$sql.= ' fk_remise_except, qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
- $sql.= ' subprice, remise_percent, ';
- $sql.= ' info_bits, ';
- $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
- $sql.= ' fk_unit,';
- $sql.= ' date_start, date_end';
+ $sql.= ' subprice, remise_percent, ';
+ $sql.= ' info_bits, ';
+ $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
+ $sql.= ' fk_unit,';
+ $sql.= ' date_start, date_end';
$sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
- $sql.= " VALUES (".$this->fk_propal.",";
- $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
- $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
- $sql.= " '".$this->db->escape($this->desc)."',";
- $sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
- $sql.= " '".$this->db->escape($this->product_type)."',";
- $sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
- $sql.= " ".price2num($this->qty).",";
- $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
- $sql.= " ".price2num($this->tva_tx).",";
- $sql.= " ".price2num($this->localtax1_tx).",";
- $sql.= " ".price2num($this->localtax2_tx).",";
+ $sql.= " VALUES (".$this->fk_propal.",";
+ $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
+ $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+ $sql.= " '".$this->db->escape($this->desc)."',";
+ $sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
+ $sql.= " '".$this->db->escape($this->product_type)."',";
+ $sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
+ $sql.= " ".price2num($this->qty).",";
+ $sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
+ $sql.= " ".price2num($this->tva_tx).",";
+ $sql.= " ".price2num($this->localtax1_tx).",";
+ $sql.= " ".price2num($this->localtax2_tx).",";
$sql.= " '".$this->db->escape($this->localtax1_type)."',";
$sql.= " '".$this->db->escape($this->localtax2_type)."',";
- $sql.= " ".($this->subprice?price2num($this->subprice):"null").",";
- $sql.= " ".price2num($this->remise_percent).",";
- $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
- $sql.= " ".price2num($this->total_ht).",";
- $sql.= " ".price2num($this->total_tva).",";
- $sql.= " ".price2num($this->total_localtax1).",";
- $sql.= " ".price2num($this->total_localtax2).",";
- $sql.= " ".price2num($this->total_ttc).",";
- $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
- $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
- $sql.= ' '.$this->special_code.',';
- $sql.= ' '.$this->rang.',';
- $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
- $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
- $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+ $sql.= " ".($this->subprice?price2num($this->subprice):"null").",";
+ $sql.= " ".price2num($this->remise_percent).",";
+ $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
+ $sql.= " ".price2num($this->total_ht).",";
+ $sql.= " ".price2num($this->total_tva).",";
+ $sql.= " ".price2num($this->total_localtax1).",";
+ $sql.= " ".price2num($this->total_localtax2).",";
+ $sql.= " ".price2num($this->total_ttc).",";
+ $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
+ $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
+ $sql.= ' '.$this->special_code.',';
+ $sql.= ' '.$this->rang.',';
+ $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
+ $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").',';
+ $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
$sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".$this->multicurrency_subprice;
$sql.= ", ".$this->multicurrency_total_ht;
$sql.= ", ".$this->multicurrency_total_tva;
$sql.= ", ".$this->multicurrency_total_ttc;
- $sql.= ')';
+ $sql.= ')';
- dol_syslog(get_class($this).'::insert', LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
+ dol_syslog(get_class($this).'::insert', LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
- {
- $this->id=$this->rowid;
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
- }
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ {
+ $this->id=$this->rowid;
+ $result=$this->insertExtraFields();
+ if ($result < 0)
+ {
+ $error++;
+ }
+ }
- if (! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('LINEPROPAL_INSERT',$user);
- if ($result < 0)
- {
- $this->db->rollback();
- return -1;
- }
- // End call triggers
- }
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('LINEPROPAL_INSERT',$user);
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ // End call triggers
+ }
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->error=$this->db->error()." sql=".$sql;
- $this->db->rollback();
- return -1;
- }
- }
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error()." sql=".$sql;
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * Delete line in database
- *
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if ko, >0 if ok
- */
- function delete($notrigger=0)
- {
- global $conf,$user;
+ /**
+ * Delete line in database
+ *
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if ko, >0 if ok
+ */
+ function delete($notrigger=0)
+ {
+ global $conf,$user;
- $error=0;
- $this->db->begin();
+ $error=0;
+ $this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
- dol_syslog("PropaleLigne::delete", LOG_DEBUG);
- if ($this->db->query($sql) )
- {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
+ dol_syslog("PropaleLigne::delete", LOG_DEBUG);
+ if ($this->db->query($sql) )
+ {
- // Remove extrafields
- if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
- {
- $this->id=$this->rowid;
- $result=$this->deleteExtraFields();
- if ($result < 0)
- {
- $error++;
- dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
- }
- }
+ // Remove extrafields
+ if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+ {
+ $this->id=$this->rowid;
+ $result=$this->deleteExtraFields();
+ if ($result < 0)
+ {
+ $error++;
+ dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+ }
+ }
- if (! $error && ! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
- if ($result < 0)
- {
- $this->db->rollback();
- return -1;
- }
- }
- // End call triggers
+ if (! $error && ! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ // End call triggers
- $this->db->commit();
+ $this->db->commit();
- return 1;
- }
- else
- {
- $this->error=$this->db->error()." sql=".$sql;
- $this->db->rollback();
- return -1;
- }
- }
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error()." sql=".$sql;
+ $this->db->rollback();
+ return -1;
+ }
+ }
- /**
- * Update propal line object into DB
- *
- * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
- * @return int <0 if ko, >0 if ok
- */
- function update($notrigger=0)
- {
- global $conf,$user;
+ /**
+ * Update propal line object into DB
+ *
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int <0 if ko, >0 if ok
+ */
+ function update($notrigger=0)
+ {
+ global $conf,$user;
- $error=0;
+ $error=0;
- $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+ $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
- // Clean parameters
- if (empty($this->tva_tx)) $this->tva_tx=0;
- if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
- if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
- if (empty($this->total_localtax1)) $this->total_localtax1=0;
- if (empty($this->total_localtax2)) $this->total_localtax2=0;
+ // Clean parameters
+ if (empty($this->tva_tx)) $this->tva_tx=0;
+ if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
+ if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
+ if (empty($this->total_localtax1)) $this->total_localtax1=0;
+ if (empty($this->total_localtax2)) $this->total_localtax2=0;
if (empty($this->localtax1_type)) $this->localtax1_type=0;
if (empty($this->localtax2_type)) $this->localtax2_type=0;
- if (empty($this->marque_tx)) $this->marque_tx=0;
- if (empty($this->marge_tx)) $this->marge_tx=0;
- if (empty($this->price)) $this->price=0; // TODO A virer
- if (empty($this->remise)) $this->remise=0; // TODO A virer
- if (empty($this->remise_percent)) $this->remise_percent=0;
- if (empty($this->info_bits)) $this->info_bits=0;
- if (empty($this->special_code)) $this->special_code=0;
- if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
- if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
- if (empty($this->subprice)) $this->subprice=0;
+ if (empty($this->marque_tx)) $this->marque_tx=0;
+ if (empty($this->marge_tx)) $this->marge_tx=0;
+ if (empty($this->price)) $this->price=0; // TODO A virer
+ if (empty($this->remise)) $this->remise=0; // TODO A virer
+ if (empty($this->remise_percent)) $this->remise_percent=0;
+ if (empty($this->info_bits)) $this->info_bits=0;
+ if (empty($this->special_code)) $this->special_code=0;
+ if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
+ if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+ if (empty($this->subprice)) $this->subprice=0;
if (empty($this->pa_ht)) $this->pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
@@ -3956,119 +3964,119 @@ class PropaleLigne extends CommonObjectLine
}
}
- $this->db->begin();
+ $this->db->begin();
- // Mise a jour ligne en base
- $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
- $sql.= " description='".$this->db->escape($this->desc)."'";
- $sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
- $sql.= ", product_type=".$this->product_type;
+ // Mise a jour ligne en base
+ $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
+ $sql.= " description='".$this->db->escape($this->desc)."'";
+ $sql.= ", label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
+ $sql.= ", product_type=".$this->product_type;
$sql.= ", vat_src_code = '".(empty($this->vat_src_code)?'':$this->vat_src_code)."'";
- $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
- $sql.= ", localtax1_tx=".price2num($this->localtax1_tx);
- $sql.= ", localtax2_tx=".price2num($this->localtax2_tx);
+ $sql.= ", tva_tx='".price2num($this->tva_tx)."'";
+ $sql.= ", localtax1_tx=".price2num($this->localtax1_tx);
+ $sql.= ", localtax2_tx=".price2num($this->localtax2_tx);
$sql.= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
$sql.= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
- $sql.= ", qty='".price2num($this->qty)."'";
- $sql.= ", subprice=".price2num($this->subprice)."";
- $sql.= ", remise_percent=".price2num($this->remise_percent)."";
- $sql.= ", price=".price2num($this->price).""; // TODO A virer
- $sql.= ", remise=".price2num($this->remise).""; // TODO A virer
- $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
- if (empty($this->skip_update_total))
- {
- $sql.= ", total_ht=".price2num($this->total_ht)."";
- $sql.= ", total_tva=".price2num($this->total_tva)."";
- $sql.= ", total_ttc=".price2num($this->total_ttc)."";
- $sql.= ", total_localtax1=".price2num($this->total_localtax1)."";
- $sql.= ", total_localtax2=".price2num($this->total_localtax2)."";
- }
+ $sql.= ", qty='".price2num($this->qty)."'";
+ $sql.= ", subprice=".price2num($this->subprice)."";
+ $sql.= ", remise_percent=".price2num($this->remise_percent)."";
+ $sql.= ", price=".price2num($this->price).""; // TODO A virer
+ $sql.= ", remise=".price2num($this->remise).""; // TODO A virer
+ $sql.= ", info_bits='".$this->db->escape($this->info_bits)."'";
+ if (empty($this->skip_update_total))
+ {
+ $sql.= ", total_ht=".price2num($this->total_ht)."";
+ $sql.= ", total_tva=".price2num($this->total_tva)."";
+ $sql.= ", total_ttc=".price2num($this->total_ttc)."";
+ $sql.= ", total_localtax1=".price2num($this->total_localtax1)."";
+ $sql.= ", total_localtax2=".price2num($this->total_localtax2)."";
+ }
$sql.= ", fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
$sql.= ", buy_price_ht=".price2num($this->pa_ht);
- if (strlen($this->special_code)) $sql.= ", special_code=".$this->special_code;
- $sql.= ", fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
- if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
- $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
- $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
- $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+ if (strlen($this->special_code)) $sql.= ", special_code=".$this->special_code;
+ $sql.= ", fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
+ if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
+ $sql.= ", date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null");
+ $sql.= ", date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
+ $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
// Multicurrency
$sql.= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
- $sql.= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
- $sql.= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
- $sql.= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+ $sql.= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+ $sql.= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+ $sql.= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
- $sql.= " WHERE rowid = ".$this->rowid;
+ $sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog(get_class($this)."::update", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
- {
- $this->id=$this->rowid;
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
- }
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ {
+ $this->id=$this->rowid;
+ $result=$this->insertExtraFields();
+ if ($result < 0)
+ {
+ $error++;
+ }
+ }
- if (! $notrigger)
- {
- // Call trigger
- $result=$this->call_trigger('LINEPROPAL_UPDATE',$user);
- if ($result < 0)
- {
- $this->db->rollback();
- return -1;
- }
- // End call triggers
- }
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('LINEPROPAL_UPDATE',$user);
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ // End call triggers
+ }
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -2;
- }
- }
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -2;
+ }
+ }
- /**
- * Update DB line fields total_xxx
- * Used by migration
- *
- * @return int <0 if ko, >0 if ok
- */
- function update_total()
- {
- $this->db->begin();
+ /**
+ * Update DB line fields total_xxx
+ * Used by migration
+ *
+ * @return int <0 if ko, >0 if ok
+ */
+ function update_total()
+ {
+ $this->db->begin();
- // Mise a jour ligne en base
- $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
- $sql.= " total_ht=".price2num($this->total_ht,'MT')."";
- $sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
- $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
- $sql.= " WHERE rowid = ".$this->rowid;
+ // Mise a jour ligne en base
+ $sql = "UPDATE ".MAIN_DB_PREFIX."propaldet SET";
+ $sql.= " total_ht=".price2num($this->total_ht,'MT')."";
+ $sql.= ",total_tva=".price2num($this->total_tva,'MT')."";
+ $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
+ $sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
+ dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- $this->db->rollback();
- return -2;
- }
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ $this->db->rollback();
+ return -2;
+ }
+ }
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5da8423c0a2..8d500f55e69 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1716,7 +1716,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '
';
print '';
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index 11d3fe7260a..d41fd9cee1d 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -389,7 +389,7 @@ class CommandeApi extends DolibarrApi
*
* @return int
*/
- function delLine($id, $lineid) {
+ function deleteLine($id, $lineid) {
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index d4b4502d4ed..6ffca33a4ce 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -353,14 +353,16 @@ class Orders extends DolibarrApi
* Delete a line to given order
*
*
- * @param int $id Id of commande to update
+ * @param int $id Id of order to update
* @param int $lineid Id of line to delete
*
* @url DELETE {id}/lines/{lineid}
*
* @return int
+ * @throws 401
+ * @throws 404
*/
- function delLine($id, $lineid) {
+ function deleteLine($id, $lineid) {
if(! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
@@ -373,7 +375,8 @@ class Orders extends DolibarrApi
if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- $request_data = (object) $request_data;
+
+ $request_data = (object) $request_data;
$updateRes = $this->commande->deleteline(DolibarrApiAccess::$user,$lineid);
if ($updateRes > 0) {
return $this->get($id);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a13e626fe20..824d8faeb88 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -169,15 +169,11 @@ class Commande extends CommonOrder
*/
const STATUS_VALIDATED = 1;
/**
- * Accepted (supplier orders)
- */
- const STATUS_ACCEPTED = 2;
- /**
- * Shipment on process (customer orders)
+ * Shipment on process
*/
const STATUS_SHIPMENTONPROCESS = 2;
/**
- * Closed (Sent/Received, billed or not)
+ * Closed (Sent, billed or not)
*/
const STATUS_CLOSED = 3;
@@ -1559,10 +1555,10 @@ class Commande extends CommonOrder
$sql.= ', ca.code as availability_code, ca.label as availability_label';
$sql.= ', dr.code as demand_reason_code';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid)';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON (c.fk_mode_reglement = p.id)';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON c.fk_cond_reglement = cr.rowid AND cr.entity IN (' . getEntity('c_payment_term') . ')';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON c.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement') . ')';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON c.fk_availability = ca.rowid';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = ca.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
$sql.= " WHERE c.entity IN (".getEntity('commande').")";
if ($id) $sql.= " AND c.rowid=".$id;
@@ -3225,7 +3221,7 @@ class Commande extends CommonOrder
}
$sql.= $clause." c.entity IN (".getEntity('commande').")";
//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
- $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
+ $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
$resql=$this->db->query($sql);
@@ -3310,7 +3306,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled');
if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft');
if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated').$billedtext;
- if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
@@ -3320,7 +3316,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort');
if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort');
if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort').$billedtext;
- if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return $langs->trans('StatusOrderSentShort').$billedtext;
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderDelivered');
@@ -3330,7 +3326,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort');
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort').$billedtext;
- if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort').$billedtext;
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBillShort');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDeliveredShort');
@@ -3340,7 +3336,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
- if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3');
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6');
@@ -3350,7 +3346,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled');
if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft');
if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1').' '.$langs->trans('StatusOrderValidated').$billedtext;
- if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return img_picto($langs->trans('StatusOrderSentShort').$billedtext,'statut3').' '.$langs->trans('StatusOrderSent').$billedtext;
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessedShort').$billedtext,'statut6').' '.$langs->trans('StatusOrderProcessed').$billedtext;
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderDelivered'),'statut6').' '.$langs->trans('StatusOrderDelivered');
@@ -3360,7 +3356,7 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderValidated').$billedtext,'statut1');
- if ($statut==self::STATUS_ACCEPTED) return ''.$langs->trans('StatusOrderSentShort').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
+ if ($statut==self::STATUS_SHIPMENTONPROCESS) return ''.$langs->trans('StatusOrderSentShort').$billedtext.' '.img_picto($langs->trans('StatusOrderSent').$billedtext,'statut3');
if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut4');
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDeliveredShort').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index fed61c1fc17..c5cc5f9b715 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -213,7 +213,7 @@ if (empty($reshook))
// TODO Move this into mass action include
if ($massaction == 'confirm_createbills') {
- $orders = GETPOST('toselect');
+ $orders = GETPOST('toselect','array');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
$validate_invoices = GETPOST('valdate_invoices', 'int');
@@ -224,13 +224,13 @@ if (empty($reshook))
$db->begin();
- foreach($orders as $id_order) {
-
+ foreach($orders as $id_order)
+ {
$cmd = new Commande($db);
- if($cmd->fetch($id_order) <= 0) continue;
+ if ($cmd->fetch($id_order) <= 0) continue;
$object = new Facture($db);
- if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+ if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
else {
$object->socid = $cmd->socid;
@@ -252,12 +252,10 @@ if (empty($reshook))
$res = $object->create($user);
if($res > 0) $nb_bills_created++;
-
}
- if($object->id > 0) {
-
- $db->begin();
+ if ($object->id > 0)
+ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
$sql.= "fk_source";
$sql.= ", sourcetype";
@@ -270,115 +268,113 @@ if (empty($reshook))
$sql.= ", '".$object->element."'";
$sql.= ")";
- if ($db->query($sql))
+ if (! $db->query($sql))
{
- $db->commit();
- }
- else
- {
- $db->rollback();
+ $error++;
}
- $lines = $cmd->lines;
- if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+ if (! $error)
{
- $cmd->fetch_lines();
- $lines = $cmd->lines;
+ $lines = $cmd->lines;
+ if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+ {
+ $cmd->fetch_lines();
+ $lines = $cmd->lines;
+ }
+
+ $fk_parent_line=0;
+ $num=count($lines);
+
+ for ($i=0;$i<$num;$i++)
+ {
+ $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+ if ($lines[$i]->subprice < 0)
+ {
+ // Negative line, we create a discount line
+ $discount = new DiscountAbsolute($db);
+ $discount->fk_soc=$object->socid;
+ $discount->amount_ht=abs($lines[$i]->total_ht);
+ $discount->amount_tva=abs($lines[$i]->total_tva);
+ $discount->amount_ttc=abs($lines[$i]->total_ttc);
+ $discount->tva_tx=$lines[$i]->tva_tx;
+ $discount->fk_user=$user->id;
+ $discount->description=$desc;
+ $discountid=$discount->create($user);
+ if ($discountid > 0)
+ {
+ $result=$object->insert_discount($discountid);
+ //$result=$discount->link_to_invoice($lineid,$id);
+ }
+ else
+ {
+ setEventMessages($discount->error, $discount->errors, 'errors');
+ $error++;
+ break;
+ }
+ }
+ else
+ {
+ // Positive line
+ $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+ // Date start
+ $date_start=false;
+ if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+ if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+ if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+ //Date end
+ $date_end=false;
+ if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+ if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+ if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+ // Reset fk_parent_line for no child products and special product
+ if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+ {
+ $fk_parent_line = 0;
+ }
+ $result = $object->addline(
+ $desc,
+ $lines[$i]->subprice,
+ $lines[$i]->qty,
+ $lines[$i]->tva_tx,
+ $lines[$i]->localtax1_tx,
+ $lines[$i]->localtax2_tx,
+ $lines[$i]->fk_product,
+ $lines[$i]->remise_percent,
+ $date_start,
+ $date_end,
+ 0,
+ $lines[$i]->info_bits,
+ $lines[$i]->fk_remise_except,
+ 'HT',
+ 0,
+ $product_type,
+ $ii,
+ $lines[$i]->special_code,
+ $object->origin,
+ $lines[$i]->rowid,
+ $fk_parent_line,
+ $lines[$i]->fk_fournprice,
+ $lines[$i]->pa_ht,
+ $lines[$i]->label
+ );
+ if ($result > 0)
+ {
+ $lineid=$result;
+ }
+ else
+ {
+ $lineid=0;
+ $error++;
+ break;
+ }
+ // Defined the new fk_parent_line
+ if ($result > 0 && $lines[$i]->product_type == 9)
+ {
+ $fk_parent_line = $result;
+ }
+ }
+ }
}
-
- $fk_parent_line=0;
- $num=count($lines);
-
- for ($i=0;$i<$num;$i++)
- {
- $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
- if ($lines[$i]->subprice < 0)
- {
- // Negative line, we create a discount line
- $discount = new DiscountAbsolute($db);
- $discount->fk_soc=$object->socid;
- $discount->amount_ht=abs($lines[$i]->total_ht);
- $discount->amount_tva=abs($lines[$i]->total_tva);
- $discount->amount_ttc=abs($lines[$i]->total_ttc);
- $discount->tva_tx=$lines[$i]->tva_tx;
- $discount->fk_user=$user->id;
- $discount->description=$desc;
- $discountid=$discount->create($user);
- if ($discountid > 0)
- {
- $result=$object->insert_discount($discountid);
- //$result=$discount->link_to_invoice($lineid,$id);
- }
- else
- {
- setEventMessages($discount->error, $discount->errors, 'errors');
- $error++;
- break;
- }
- }
- else
- {
- // Positive line
- $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
- // Date start
- $date_start=false;
- if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
- if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
- if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
- //Date end
- $date_end=false;
- if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
- if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
- if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
- // Reset fk_parent_line for no child products and special product
- if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
- {
- $fk_parent_line = 0;
- }
- $result = $object->addline(
- $desc,
- $lines[$i]->subprice,
- $lines[$i]->qty,
- $lines[$i]->tva_tx,
- $lines[$i]->localtax1_tx,
- $lines[$i]->localtax2_tx,
- $lines[$i]->fk_product,
- $lines[$i]->remise_percent,
- $date_start,
- $date_end,
- 0,
- $lines[$i]->info_bits,
- $lines[$i]->fk_remise_except,
- 'HT',
- 0,
- $product_type,
- $ii,
- $lines[$i]->special_code,
- $object->origin,
- $lines[$i]->rowid,
- $fk_parent_line,
- $lines[$i]->fk_fournprice,
- $lines[$i]->pa_ht,
- $lines[$i]->label
- );
- if ($result > 0)
- {
- $lineid=$result;
- }
- else
- {
- $lineid=0;
- $error++;
- break;
- }
- // Defined the new fk_parent_line
- if ($result > 0 && $lines[$i]->product_type == 9)
- {
- $fk_parent_line = $result;
- }
- }
- }
-
}
//$cmd->classifyBilled($user); // Disabled. This behavior must be set or not using the workflow module.
@@ -391,27 +387,29 @@ if (empty($reshook))
$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
$toselect = array();
- if(!empty($validate_invoices)) {
-
+ if (! $error && $validate_invoices)
+ {
$massaction = $action = 'builddoc';
+ foreach($TAllFact as &$object)
+ {
+ $result = $object->validate($user);
+ if ($result <= 0)
+ {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ break;
+ }
- foreach($TAllFact as &$object) {
- $object->validate($user);
- $toselect[] = $object->id; // For builddoc action
+ $id = $object->id; // For builddoc action
// Fac builddoc
+ $donotredirect = 1;
$upload_dir = $conf->facture->dir_output;
$permissioncreate=$user->rights->facture->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
}
- $objectclass='Facture';
- $objectlabel='Invoice';
- $permtoread = $user->rights->facture->lire;
- $permtodelete = $user->rights->facture->supprimer;
- $uploaddir = $conf->facture->dir_output;
- include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
+ $massaction = $action = 'confirm_createbills';
}
if (! $error)
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index eb14db2d3ac..44badfa51d8 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -149,7 +149,7 @@ dol_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), -1, 'account'
$title=$langs->trans("FinancialAccount")." : ".$object->label;
$link=($year_start?"".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")." ".img_next('', 'class="valignbottom"')." ":"");
-$linkback = ''.$langs->trans("BackToList").' ';
+$linkback = ''.$langs->trans("BackToList").' ';
if (!empty($id))
@@ -203,7 +203,7 @@ print '';
$var=true;
for ($mois = 1 ; $mois < 13 ; $mois++)
{
-
+
print '';
print "".dol_print_date(dol_mktime(1,1,1,$mois,1,2000),"%B")." ";
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries_list.php
similarity index 99%
rename from htdocs/compta/bank/bankentries.php
rename to htdocs/compta/bank/bankentries_list.php
index a04d9cf0f2e..271cb03cd6d 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -23,7 +23,7 @@
*/
/**
- * \file htdocs/compta/bank/bankentries.php
+ * \file htdocs/compta/bank/bankentries_list.php
* \ingroup banque
* \brief List of bank transactions
*/
@@ -405,7 +405,7 @@ if ($id > 0 || ! empty($ref))
$head=bank_prepare_head($object);
dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
@@ -447,7 +447,7 @@ if ($id > 0 || ! empty($ref))
if ($object->canBeConciliated() > 0) {
// If not cash account and can be reconciliate
if ($user->rights->banque->consolidate) {
- print ''.$langs->trans("Conciliate").' ';
+ print ''.$langs->trans("Conciliate").' ';
} else {
print ''.$langs->trans("Conciliate").' ';
}
@@ -559,7 +559,7 @@ if (! empty($thirdparty)) $mode_balance_ok=false;
$sql.= $db->plimit($limit+1,$offset);
-dol_syslog('compta/bank/bankentries.php', LOG_DEBUG);
+dol_syslog('compta/bank/bankentries_list.php', LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
@@ -1161,7 +1161,7 @@ if ($resql)
if (! empty($arrayfields['type']['checked']))
{
print '';
- $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
+ $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle','',1);
if ($labeltype == 'SOLD') print ' '; //$langs->trans("InitialBankBalance");
else print $labeltype;
print " \n";
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 699edd31b7a..15aae28c1d1 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -74,9 +74,9 @@ if ($result)
while ($i < $num)
{
$objp = $db->fetch_object($result);
-
+
print ' ';
- print "rowid\">$objp->label rowid\">$objp->label '.$objp->nombre.' ';
print ''.price(abs($objp->somme))." ";
print ''.price(abs(price2num($objp->somme / $objp->nombre,'MT')))." ";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index b32d4ea938e..27de7b6e863 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -72,204 +72,204 @@ if ($cancel) $action='';
if ($action == 'add')
{
- $error=0;
+ $error=0;
- $db->begin();
+ $db->begin();
- // Create account
- $object = new Account($db);
+ // Create account
+ $object = new Account($db);
- $object->ref = dol_sanitizeFileName(trim($_POST["ref"]));
- $object->label = trim($_POST["label"]);
- $object->courant = $_POST["type"];
- $object->clos = $_POST["clos"];
- $object->rappro = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
- $object->url = $_POST["url"];
+ $object->ref = dol_sanitizeFileName(trim($_POST["ref"]));
+ $object->label = trim($_POST["label"]);
+ $object->courant = $_POST["type"];
+ $object->clos = $_POST["clos"];
+ $object->rappro = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+ $object->url = $_POST["url"];
$object->bank = trim($_POST["bank"]);
- $object->code_banque = trim($_POST["code_banque"]);
- $object->code_guichet = trim($_POST["code_guichet"]);
- $object->number = trim($_POST["number"]);
- $object->cle_rib = trim($_POST["cle_rib"]);
- $object->bic = trim($_POST["bic"]);
- $object->iban = trim($_POST["iban"]);
- $object->domiciliation = trim($_POST["domiciliation"]);
+ $object->code_banque = trim($_POST["code_banque"]);
+ $object->code_guichet = trim($_POST["code_guichet"]);
+ $object->number = trim($_POST["number"]);
+ $object->cle_rib = trim($_POST["cle_rib"]);
+ $object->bic = trim($_POST["bic"]);
+ $object->iban = trim($_POST["iban"]);
+ $object->domiciliation = trim($_POST["domiciliation"]);
- $object->proprio = trim($_POST["proprio"]);
- $object->owner_address = trim($_POST["owner_address"]);
+ $object->proprio = trim($_POST["proprio"]);
+ $object->owner_address = trim($_POST["owner_address"]);
$account_number = GETPOST('account_number','alpha');
if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
$fk_accountancy_journal = GETPOST('fk_accountancy_journal','int');
if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
- $object->solde = $_POST["solde"];
- $object->date_solde = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+ $object->solde = $_POST["solde"];
+ $object->date_solde = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- $object->currency_code = trim($_POST["account_currency_code"]);
+ $object->currency_code = trim($_POST["account_currency_code"]);
- $object->state_id = $_POST["account_state_id"];
- $object->country_id = $_POST["account_country_id"];
+ $object->state_id = $_POST["account_state_id"];
+ $object->country_id = $_POST["account_country_id"];
- $object->min_allowed = GETPOST("account_min_allowed",'int');
- $object->min_desired = GETPOST("account_min_desired",'int');
- $object->comment = trim(GETPOST("account_comment"));
+ $object->min_allowed = GETPOST("account_min_allowed",'int');
+ $object->min_desired = GETPOST("account_min_desired",'int');
+ $object->comment = trim(GETPOST("account_comment"));
- $object->fk_user_author = $user->id;
+ $object->fk_user_author = $user->id;
- if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
- $error++;
- }
- if (empty($object->ref))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
- $error++;
- }
- if (empty($object->label))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
- $error++;
- }
+ if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
+ $action='create'; // Force chargement page en mode creation
+ $error++;
+ }
+ if (empty($object->ref))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+ $action='create'; // Force chargement page en mode creation
+ $error++;
+ }
+ if (empty($object->label))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+ $action='create'; // Force chargement page en mode creation
+ $error++;
+ }
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
- if (! $error)
- {
- $id = $object->create($user);
- if ($id > 0)
- {
- // Category association
- $categories = GETPOST('categories', 'array');
- $object->setCategories($categories);
+ if (! $error)
+ {
+ $id = $object->create($user);
+ if ($id > 0)
+ {
+ // Category association
+ $categories = GETPOST('categories', 'array');
+ $object->setCategories($categories);
- $_GET["id"]=$id; // Force chargement page en mode visu
+ $_GET["id"]=$id; // Force chargement page en mode visu
- $action='';
- }
- else {
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
+ $action='';
+ }
+ else {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
- $action='create'; // Force chargement page en mode creation
- }
- }
+ $action='create'; // Force chargement page en mode creation
+ }
+ }
- if (! $error)
- {
- $db->commit();
- }
- else
- {
- $db->rollback();
- }
+ if (! $error)
+ {
+ $db->commit();
+ }
+ else
+ {
+ $db->rollback();
+ }
}
if ($action == 'update')
{
- $error=0;
+ $error=0;
- // Update account
- $object = new Account($db);
- $object->fetch(GETPOST("id"));
+ // Update account
+ $object = new Account($db);
+ $object->fetch(GETPOST("id"));
- $object->ref = dol_string_nospecial(trim($_POST["ref"]));
- $object->label = trim($_POST["label"]);
- $object->courant = $_POST["type"];
- $object->clos = $_POST["clos"];
- $object->rappro = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
- $object->url = trim($_POST["url"]);
+ $object->ref = dol_string_nospecial(trim($_POST["ref"]));
+ $object->label = trim($_POST["label"]);
+ $object->courant = $_POST["type"];
+ $object->clos = $_POST["clos"];
+ $object->rappro = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+ $object->url = trim($_POST["url"]);
- $object->bank = trim($_POST["bank"]);
- $object->code_banque = trim($_POST["code_banque"]);
- $object->code_guichet = trim($_POST["code_guichet"]);
- $object->number = trim($_POST["number"]);
- $object->cle_rib = trim($_POST["cle_rib"]);
- $object->bic = trim($_POST["bic"]);
- $object->iban = trim($_POST["iban"]);
- $object->domiciliation = trim($_POST["domiciliation"]);
+ $object->bank = trim($_POST["bank"]);
+ $object->code_banque = trim($_POST["code_banque"]);
+ $object->code_guichet = trim($_POST["code_guichet"]);
+ $object->number = trim($_POST["number"]);
+ $object->cle_rib = trim($_POST["cle_rib"]);
+ $object->bic = trim($_POST["bic"]);
+ $object->iban = trim($_POST["iban"]);
+ $object->domiciliation = trim($_POST["domiciliation"]);
- $object->proprio = trim($_POST["proprio"]);
- $object->owner_address = trim($_POST["owner_address"]);
+ $object->proprio = trim($_POST["proprio"]);
+ $object->owner_address = trim($_POST["owner_address"]);
$account_number = GETPOST('account_number', 'int');
if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
$fk_accountancy_journal = GETPOST('fk_accountancy_journal','int');
if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
- $object->currency_code = trim($_POST["account_currency_code"]);
+ $object->currency_code = trim($_POST["account_currency_code"]);
- $object->state_id = $_POST["account_state_id"];
- $object->country_id = $_POST["account_country_id"];
+ $object->state_id = $_POST["account_state_id"];
+ $object->country_id = $_POST["account_country_id"];
- $object->min_allowed = GETPOST("account_min_allowed",'int');
- $object->min_desired = GETPOST("account_min_desired",'int');
- $object->comment = trim(GETPOST("account_comment"));
+ $object->min_allowed = GETPOST("account_min_allowed",'int');
+ $object->min_desired = GETPOST("account_min_desired",'int');
+ $object->comment = trim(GETPOST("account_comment"));
- if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
- $action='edit'; // Force chargement page en mode creation
- $error++;
- }
- if (empty($object->ref))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
- $action='edit'; // Force chargement page en mode creation
- $error++;
- }
- if (empty($object->label))
- {
- setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
- $action='edit'; // Force chargement page en mode creation
- $error++;
- }
+ if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
+ $action='edit'; // Force chargement page en mode creation
+ $error++;
+ }
+ if (empty($object->ref))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+ $action='edit'; // Force chargement page en mode creation
+ $error++;
+ }
+ if (empty($object->label))
+ {
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+ $action='edit'; // Force chargement page en mode creation
+ $error++;
+ }
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
- if (! $error)
- {
- $result = $object->update($user);
- if ($result >= 0)
- {
- // Category association
- $categories = GETPOST('categories', 'array');
- $object->setCategories($categories);
+ if (! $error)
+ {
+ $result = $object->update($user);
+ if ($result >= 0)
+ {
+ // Category association
+ $categories = GETPOST('categories', 'array');
+ $object->setCategories($categories);
- $_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $action='edit'; // Force chargement page edition
- }
- }
+ $_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action='edit'; // Force chargement page edition
+ }
+ }
}
if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
{
- // Delete
- $object = new Account($db);
- $object->fetch(GETPOST("id","int"));
- $result = $object->delete($user);
+ // Delete
+ $object = new Account($db);
+ $object->fetch(GETPOST("id","int"));
+ $result = $object->delete($user);
- if ($result > 0)
- {
- setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
- header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
- exit;
- }
- else
- {
- setEventMessages($account->error, $account->errors, 'errors');
- $action='';
- }
+ if ($result > 0)
+ {
+ setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+ header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
+ exit;
+ }
+ else
+ {
+ setEventMessages($account->error, $account->errors, 'errors');
+ $action='';
+ }
}
@@ -297,10 +297,10 @@ if ($action == 'create')
print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
- if ($conf->use_javascript_ajax)
- {
+ if ($conf->use_javascript_ajax)
+ {
print "\n".''."\n";
- }
+ print ''."\n";
+ }
print ' ';
// Label
print ''.$langs->trans("LabelBankCashAccount").' ';
- print ''.$langs->trans("AccountType").' ';
@@ -347,12 +347,12 @@ if ($action == 'create')
print ''.$langs->trans("Status").' ';
- print '';
- print $form->selectarray("clos", $object->status,(isset($_POST["clos"])?$_POST["clos"]:$object->clos));
- print ' '.$langs->trans("Status").' ';
+ print '';
+ print $form->selectarray("clos", $object->status,(GETPOST("clos",'int')!=''?GETPOST("clos",'int'):$object->clos));
+ print ' '.$langs->trans("Web").' ';
print ''.$langs->trans("Categories").' ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
- $c = new Categorie($db);
- $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
- foreach($cats as $cat) {
- $arrayselected[] = $cat->id;
- }
- print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
- print " '.$langs->trans("Categories").' ';
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
+ $c = new Categorie($db);
+ $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
+ foreach($cats as $cat) {
+ $arrayselected[] = $cat->id;
+ }
+ print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+ print " '.$langs->trans("Comment").' ';
print '';
- // Editor wysiwyg
+ // Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'90%');
$doleditor->Create();
@@ -409,7 +409,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit',$parameters);
@@ -504,7 +504,7 @@ if ($action == 'create')
print '';
// Accountancy code
$fieldrequired='';
- if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+ if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
if (! empty($conf->accounting->enabled))
{
@@ -523,7 +523,7 @@ if ($action == 'create')
if (! empty($conf->accounting->enabled))
{
print ''.$langs->trans("AccountancyJournal").' ';
- print '';
+ print ' ';
print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
print ' '.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -605,7 +605,7 @@ else
print '';
$conciliate=$object->canBeConciliated();
if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
- else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
+ else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
else print ($object->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
print ' ';
@@ -624,15 +624,15 @@ else
print $accountingaccount->getNomUrl(0,1,1,'',1);
} else {
- print $object->account_number;
+ print $object->account_number;
}
print '';
// Accountancy journal
if (! empty($conf->accounting->enabled))
{
- print ''.$langs->trans("AccountancyJournal").' ';
- print '';
+ print ' '.$langs->trans("AccountancyJournal").' ';
+ print '';
$accountingjournal = new AccountingJournal($db);
$accountingjournal->fetch($object->fk_accountancy_journal);
@@ -655,12 +655,12 @@ else
print '';
- // Categories
- if ($conf->categorie->enabled) {
- print ''.$langs->trans("Categories").' ';
- print $form->showCategories($object->id,'bank_account',1);
- print " '.$langs->trans("Categories").' ';
+ print $form->showCategories($object->id,'bank_account',1);
+ print " '.$langs->trans("Comment").' ';
print ''.dol_htmlentitiesbr($object->comment).'
';
+ print '
';
- print '';
+ print '';
print ''.$langs->trans("BankName").' ';
print ''.$object->bank.' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- 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.='';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
+ $langs->load("projects");
+ $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ 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.='';
+ $morehtmlref.=$proj->ref;
+ $morehtmlref.=' ';
+ } else {
+ $morehtmlref.='';
+ }
+ }
}
$morehtmlref.='';
@@ -492,7 +495,7 @@ if ($id > 0)
print ''.$langs->trans("Type")." ".$object->type_libelle." ";
print "".$langs->trans("PeriodEndDate")." ";
print "";
if ($action == 'edit')
@@ -517,51 +520,51 @@ if ($id > 0)
}
// Amount
- if ($action == 'edit')
- {
- print ' '.$langs->trans("AmountTTC")." ";
- print ' '.$langs->trans("AmountTTC").' '.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).' '.$langs->trans("AmountTTC")." ";
+ print ' '.$langs->trans("AmountTTC").' '.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).' ';
- print '';
- print ' ';
- if ($action == 'editmode') {
- $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
- } else {
- $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
- }
- print ' ';
+ print '';
+ print ' ';
+ if ($action == 'editmode') {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
+ } else {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
+ }
+ print ' ';
- print '';
- print ' ';
- if ($action == 'editbankaccount') {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
- } else {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editbankaccount') {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+ } else {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+ }
+ print ' ';
+ print '
';
@@ -569,77 +572,106 @@ if ($id > 0)
print '';
print '
';
+ $nbcols = 3;
+ if (! empty($conf->banque->enabled)) {
+ $nbcols ++;
+ }
+
/*
* Payments
*/
$sql = "SELECT p.rowid, p.num_paiement, datep as dp, p.amount,";
- $sql.= "c.code as type_code,c.libelle as paiement_type";
+ $sql.= " c.code as type_code,c.libelle as paiement_type,";
+ $sql.= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
+ $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+ $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " WHERE p.fk_charge = ".$id;
$sql.= " AND p.fk_charge = cs.rowid";
$sql.= " AND cs.entity = ".$conf->entity;
$sql.= " AND p.fk_typepaiement = c.id";
+ $sql.= " AND c.entity = " . getEntity('c_paiement');
$sql.= " ORDER BY dp DESC";
//print $sql;
$resql = $db->query($sql);
if ($resql)
{
- $totalpaye = 0;
+ $totalpaye = 0;
- $num = $db->num_rows($resql);
- $i = 0; $total = 0;
- print '
';
- print '';
- print ''.$langs->trans("RefPayment").' ';
- print ''.$langs->trans("Date").' ';
- print ''.$langs->trans("Type").' ';
- print ''.$langs->trans("Amount").' ';
- print ' ';
+ $num = $db->num_rows($resql);
+ $i = 0; $total = 0;
+ print '';
+ print '';
+ print ''.$langs->trans("RefPayment").' ';
+ print ''.$langs->trans("Date").' ';
+ print ''.$langs->trans("Type").' ';
+ if (! empty($conf->banque->enabled)) {
+ print '' . $langs->trans('BankAccount') . ' ';
+ }
+ print ''.$langs->trans("Amount").' ';
+ print ' ';
- $var=true;
- if ($num > 0)
- {
- while ($i < $num)
- {
- $objp = $db->fetch_object($resql);
+ if ($num > 0)
+ {
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($resql);
- print "";
- print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' ';
- print ''.dol_print_date($db->jdate($objp->dp),'day')." \n";
- $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
- print "".$labeltype.' '.$objp->num_paiement." \n";
- print ''.price($objp->amount)." \n";
- print "';
+ print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' ';
+ print ''.dol_print_date($db->jdate($objp->dp),'day')." \n";
+ $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+ print "".$labeltype.' '.$objp->num_paiement." \n";
+ if (! empty($conf->banque->enabled))
+ {
+ $bankaccountstatic->id = $objp->baid;
+ $bankaccountstatic->ref = $objp->baref;
+ $bankaccountstatic->label = $objp->baref;
+ $bankaccountstatic->number = $objp->banumber;
- print ''.$langs->trans("None").' ".$langs->trans("AlreadyPaid")." : ".price($totalpaye)." ".$langs->trans("AmountExpected")." : ".price($object->amount)." ';
+ if ($bankaccountstatic->id)
+ print $bankaccountstatic->getNomUrl(1, 'transactions');
+ print ' ';
+ }
+ print ''.price($objp->amount)." \n";
+ print "";
+ $totalpaye += $objp->amount;
+ $i++;
+ }
+ }
+ else
+ {
- print "".$langs->trans("RemainderToPay")." : ";
- print ''.price($resteapayer)."
";
- $db->free($resql);
+ print ''.$langs->trans("None").' '.$langs->trans("AlreadyPaid")." : ".price($totalpaye)." '.$langs->trans("AmountExpected")." : ".price($object->amount)." '.$langs->trans("RemainderToPay")." : ";
+ print ''.price($resteapayer)."
";
+ $db->free($resql);
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
print '
';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 83fe7d8b6b6..dc089c13e30 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -83,7 +83,7 @@ class ChargeSociales extends CommonObject
$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
else $sql.= " WHERE cs.rowid = ".$id;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 1d553831f99..0036c61fef9 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -33,6 +33,7 @@ class PaymentSocialContribution extends CommonObject
{
public $element='paiementcharge'; //!< Id that identify managed objects
public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored
+ public $picto = 'payment';
var $fk_charge;
var $datec='';
@@ -78,7 +79,7 @@ class PaymentSocialContribution extends CommonObject
$now=dol_now();
dol_syslog(get_class($this)."::create", LOG_DEBUG);
-
+
// Validate parametres
if (! $this->datepaye)
{
@@ -125,7 +126,7 @@ class PaymentSocialContribution extends CommonObject
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiementcharge");
-
+
// Insere tableau des montants / factures
foreach ($this->amounts as $key => $amount)
{
@@ -137,7 +138,7 @@ class PaymentSocialContribution extends CommonObject
// If we want to closed payed invoices
if ($closepaidcontrib)
{
-
+
$contrib=new ChargeSociales($this->db);
$contrib->fetch($contribid);
$paiement = $contrib->getSommePaiement();
@@ -205,6 +206,7 @@ class PaymentSocialContribution extends CommonObject
$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."paiementcharge as t)";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepaiement = pt.id";
+ $sql.= " AND pt.entity = " . getEntity('c_paiement');
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -612,6 +614,68 @@ class PaymentSocialContribution extends CommonObject
}
}
+
+ /**
+ * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+ *
+ * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+ * @return string Libelle
+ */
+ function getLibStatut($mode=0)
+ {
+ return $this->LibStatut($this->statut,$mode);
+ }
+
+ /**
+ * Renvoi le libelle d'un statut donne
+ *
+ * @param int $status Statut
+ * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+ * @return string Libelle du statut
+ */
+ function LibStatut($status,$mode=0)
+ {
+ global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+ $langs->load('compta');
+ /*if ($mode == 0)
+ {
+ if ($status == 0) return $langs->trans('ToValidate');
+ if ($status == 1) return $langs->trans('Validated');
+ }
+ if ($mode == 1)
+ {
+ if ($status == 0) return $langs->trans('ToValidate');
+ if ($status == 1) return $langs->trans('Validated');
+ }
+ if ($mode == 2)
+ {
+ if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+ if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+ }
+ if ($mode == 3)
+ {
+ if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+ if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+ }
+ if ($mode == 4)
+ {
+ if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+ if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+ }
+ if ($mode == 5)
+ {
+ if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+ if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+ }
+ if ($mode == 6)
+ {
+ if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+ if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+ }*/
+ return '';
+ }
+
/**
* Return clicable name (with picto eventually)
*
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 879e9b69ee7..0bdff23007a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -133,7 +133,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs,";
$sql.= " ".MAIN_DB_PREFIX."paiementcharge as pc";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id AND pct.entity = " . getEntity('c_paiement');
$sql.= " WHERE cs.fk_type = c.id AND pc.fk_charge = cs.rowid";
$sql.= " AND cs.entity = ".$conf->entity;
if ($year > 0)
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 0d4d827e694..c22fb4ed30a 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -100,7 +100,7 @@ $bankstatic = new Account($db);
$sql = "SELECT t.rowid, t.amount, t.label, t.datev as dv, t.datep as dp, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id AND pst.entity = " . getEntity('c_paiement');
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
$sql.= " WHERE t.entity = ".$conf->entity;
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 04c62107e83..c885f0869de 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -210,7 +210,7 @@ else
dol_fiche_head($head, 'agenda', $title, -1, 'contact');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
@@ -257,30 +257,33 @@ else
}
- print '
';
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
{
+ print '
';
+
$param='&id='.$id;
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-
- print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'','');
+ print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
// List of all actions
$filters=array();
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ac3c52ae8f5..dc6d19614f9 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1064,7 +1064,7 @@ else
}
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 2329ae63685..7e9437f5442 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -987,38 +987,52 @@ class Contact extends CommonObject
* Return name of contact with link (and eventually picto)
* Use $this->id, $this->lastname, $this->firstname, this->civility_id
*
- * @param int $withpicto Include picto with link
- * @param string $option Where the link point to
- * @param int $maxlen Max length of
- * @param string $moreparam Add more param into URL
- * @return string String with URL
+ * @param int $withpicto Include picto with link
+ * @param string $option Where the link point to
+ * @param int $maxlen Max length of
+ * @param string $moreparam Add more param into URL
+ * @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
*/
- function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='')
+ function getNomUrl($withpicto=0, $option='', $maxlen=0, $moreparam='', $save_lastsearch_value=-1)
{
global $conf, $langs, $hookmanager;
$result='';
- $label = '
' . $langs->trans("ShowContact") . ' ';
- $label.= '
' . $langs->trans("Name") . ': '.$this->getFullName($langs);
- //if ($this->civility_id) $label.= '
' . $langs->trans("Civility") . ': '.$this->civility_id; // TODO Translate cibilty_id code
- if (! empty($this->poste)) $label.= '
' . $langs->trans("Poste") . ': '.$this->poste;
- $label.= '
' . $langs->trans("EMail") . ': '.$this->email;
- $phonelist=array();
- if ($this->phone_pro) $phonelist[]=$this->phone_pro;
- if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
- if ($this->phone_perso) $phonelist[]=$this->phone_perso;
- $label.= '
' . $langs->trans("Phone") . ': '.join(', ',$phonelist);
- $label.= '
' . $langs->trans("Address") . ': '.dol_format_address($this, 1, ' ', $langs);
- $link = '
global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
- $label=$langs->trans("ShowContact");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
- }
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.= ' class="classfortooltip">';
+ $label = '' . $langs->trans("ShowContact") . ' ';
+ $label.= '' . $langs->trans("Name") . ': '.$this->getFullName($langs);
+ //if ($this->civility_id) $label.= '' . $langs->trans("Civility") . ': '.$this->civility_id; // TODO Translate cibilty_id code
+ if (! empty($this->poste)) $label.= '' . $langs->trans("Poste") . ': '.$this->poste;
+ $label.= '' . $langs->trans("EMail") . ': '.$this->email;
+ $phonelist=array();
+ if ($this->phone_pro) $phonelist[]=$this->phone_pro;
+ if ($this->phone_mobile) $phonelist[]=$this->phone_mobile;
+ if ($this->phone_perso) $phonelist[]=$this->phone_perso;
+ $label.= '' . $langs->trans("Phone") . ': '.join(', ',$phonelist);
+ $label.= '' . $langs->trans("Address") . ': '.dol_format_address($this, 1, ' ', $langs);
+
+ $url = DOL_URL_ROOT.'/contact/card.php?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';
+ }
+
+ $url .= $moreparam;
+
+ $linkstart = ' global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowContact");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.= ' class="classfortooltip">';
if (! is_object($hookmanager))
{
@@ -1030,18 +1044,17 @@ class Contact extends CommonObject
$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $linkclose = $hookmanager->resPrint;
- $link.=$linkclose;
-
+ $linkstart.=$linkclose;
$linkend=' ';
if ($option == 'xxx')
{
- $link = '
';
+ $linkstart = ' ';
$linkend=' ';
}
- if ($withpicto) $result.=($link.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
- $result.=$link.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
+ if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
+ $result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
return $result;
}
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index da8ef616a4f..a016fa87b31 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -107,8 +107,8 @@ if ($object->id)
$totalsize+=$file['size'];
}
- $linkback = '
'.$langs->trans("BackToList").' ';
-
+ $linkback = '
'.$langs->trans("BackToList").' ';
+
$morehtmlref='
';
if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
{
@@ -120,11 +120,11 @@ if ($object->id)
else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
}
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-
+
print '
';
-
+
print '
';
print '
';
@@ -147,7 +147,7 @@ if ($object->id)
print '';
}
}*/
-
+
// Civility
print ''.$langs->trans("UserTitle").' ';
print $object->getCivilityLabel();
@@ -160,7 +160,7 @@ if ($object->id)
print '';
dol_fiche_end();
-
+
$modulepart = 'contact';
$permission = $user->rights->societe->contact->creer;
$permtoedit = $user->rights->societe->contact->creer;
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 20d379b50d0..287c27d8b10 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -61,7 +61,7 @@ if ($id > 0)
dol_fiche_head($head, 'info', $title, -1, 'contact');
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
@@ -71,11 +71,11 @@ if ($id > 0)
print '
';
print ''.$langs->trans("BackToList").' ';
+
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
print '';
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index b52f9bf8727..1fa766e0913 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -74,8 +74,8 @@ if ($id > 0)
$head = contact_prepare_head($object);
dol_fiche_head($head, 'note', $title, -1, 'contact');
-
- $linkback = '
'.$langs->trans("BackToList").' ';
+
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
@@ -88,13 +88,13 @@ if ($id > 0)
else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
}
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-
+
$cssclass='titlefield';
//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
-
+
print '
';
print '
';
@@ -107,12 +107,12 @@ if ($id > 0)
print "
";
-
+
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
print '
';
-
+
dol_fiche_end();
}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 30fa10b5ddc..9e85ef98294 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -60,7 +60,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact
$object->old_firstname='';
// Logo/Photo save
$dir= $conf->societe->dir_output.'/contact/' . get_exdir($object->id,0,0,1,$object,'contact').'/photos';
-
+
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
if ($file_OK)
{
@@ -88,7 +88,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact
else
{
// Create thumbs
- $object->addThumbs($newfile);
+ $object->addThumbs($newfile);
}
}
}
@@ -147,26 +147,26 @@ if ($action == 'edit')
print '
';
dol_fiche_head($head, 'perso', $title, 0, 'contact');
-
+
print '
';
// Ref
print ''.$langs->trans("Ref").' ';
print $object->id;
print ' ';
-
+
// Photo
print '';
print $form->showphoto('contact',$object)."\n";
if ($object->photo) print "
";
dol_fiche_end();
-
+
print '
';
print '
';
print ' ';
@@ -228,11 +228,11 @@ if ($action == 'edit')
else
{
// View mode
-
+
dol_fiche_head($head, 'perso', $title, -1, 'contact');
-
- $linkback = '
'.$langs->trans("BackToList").' ';
-
+
+ $linkback = '
'.$langs->trans("BackToList").' ';
+
$morehtmlref='
';
if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
{
@@ -244,13 +244,13 @@ else
else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany");
}
$morehtmlref.='
';
-
-
+
+
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-
-
+
+
print '
';
-
+
print '
';
print '
';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 46fa2b3ca87..02970135b76 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -327,7 +327,7 @@ if (empty($reshook))
$label = $lines[$i]->product_label;
}
- $desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
+ $desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
}
else {
$desc = dol_htmlentitiesbr($lines[$i]->desc);
@@ -440,6 +440,14 @@ if (empty($reshook))
$error++;
}
+ $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
+ $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+ if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
+ {
+ setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+ $error++;
+ }
+
// Extrafields
$extrafieldsline = new ExtraFields($db);
$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -638,90 +646,100 @@ if (empty($reshook))
else if ($action == 'updateline' && $user->rights->contrat->creer && ! GETPOST('cancel','alpha'))
{
- $objectline = new ContratLigne($db);
- if ($objectline->fetch(GETPOST('elrowid')))
- {
- $db->begin();
+ if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
+ {
+ setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+ $action = 'editline';
+ $_GET['rowid'] = GETPOST('elrowid');
+ $error++;
+ }
- if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
- if ($date_end_real_update == '') $date_end_real_update=$objectline->date_cloture;
+ if (!$error) {
+ $objectline = new ContratLigne($db);
+ if ($objectline->fetch(GETPOST('elrowid')))
+ {
+ $db->begin();
- $vat_rate = GETPOST('eltva_tx');
- // Define info_bits
- $info_bits = 0;
- if (preg_match('/\*/', $vat_rate))
- $info_bits |= 0x01;
+ if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
+ if ($date_end_real_update == '') $date_end_real_update=$objectline->date_cloture;
- // Define vat_rate
- $vat_rate = str_replace('*', '', $vat_rate);
- $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
- $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+ $vat_rate = GETPOST('eltva_tx');
+ // Define info_bits
+ $info_bits = 0;
+ if (preg_match('/\*/', $vat_rate))
+ $info_bits |= 0x01;
- $txtva = $vat_rate;
+ // Define vat_rate
+ $vat_rate = str_replace('*', '', $vat_rate);
+ $localtax1_tx=get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+ $localtax2_tx=get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
- // Clean vat code
- $vat_src_code='';
- if (preg_match('/\((.*)\)/', $txtva, $reg))
- {
- $vat_src_code = $reg[1];
- $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
- }
+ $txtva = $vat_rate;
- // ajout prix d'achat
- $fk_fournprice = $_POST['fournprice'];
- if ( ! empty($_POST['buying_price']) )
- $pa_ht = $_POST['buying_price'];
- else
- $pa_ht = null;
+ // Clean vat code
+ $vat_src_code='';
+ if (preg_match('/\((.*)\)/', $txtva, $reg))
+ {
+ $vat_src_code = $reg[1];
+ $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+ }
- $fk_unit = GETPOST('unit', 'alpha');
+ // ajout prix d'achat
+ $fk_fournprice = $_POST['fournprice'];
+ if ( ! empty($_POST['buying_price']) )
+ $pa_ht = $_POST['buying_price'];
+ else
+ $pa_ht = null;
- $objectline->description=GETPOST('product_desc','none');
- $objectline->price_ht=GETPOST('elprice');
- $objectline->subprice=GETPOST('elprice');
- $objectline->qty=GETPOST('elqty');
- $objectline->remise_percent=GETPOST('elremise_percent');
- $objectline->tva_tx=($txtva?$txtva:0); // Field may be disabled, so we use vat rate 0
- $objectline->vat_src_code=$vat_src_code;
- $objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
- $objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
- $objectline->date_ouverture_prevue=$date_start_update;
- $objectline->date_ouverture=$date_start_real_update;
- $objectline->date_fin_validite=$date_end_update;
- $objectline->date_cloture=$date_end_real_update;
- $objectline->fk_user_cloture=$user->id;
- $objectline->fk_fournprice=$fk_fournprice;
- $objectline->pa_ht=$pa_ht;
+ $fk_unit = GETPOST('unit', 'alpha');
- if ($fk_unit > 0) {
- $objectline->fk_unit = GETPOST('unit');
- } else {
- $objectline->fk_unit = null;
- }
+ $objectline->description=GETPOST('product_desc','none');
+ $objectline->price_ht=GETPOST('elprice');
+ $objectline->subprice=GETPOST('elprice');
+ $objectline->qty=GETPOST('elqty');
+ $objectline->remise_percent=GETPOST('elremise_percent');
+ $objectline->tva_tx=($txtva?$txtva:0); // Field may be disabled, so we use vat rate 0
+ $objectline->vat_src_code=$vat_src_code;
+ $objectline->localtax1_tx=is_numeric($localtax1_tx)?$localtax1_tx:0;
+ $objectline->localtax2_tx=is_numeric($localtax2_tx)?$localtax2_tx:0;
+ $objectline->date_ouverture_prevue=$date_start_update;
+ $objectline->date_ouverture=$date_start_real_update;
+ $objectline->date_fin_validite=$date_end_update;
+ $objectline->date_cloture=$date_end_real_update;
+ $objectline->fk_user_cloture=$user->id;
+ $objectline->fk_fournprice=$fk_fournprice;
+ $objectline->pa_ht=$pa_ht;
- // Extrafields
- $extrafieldsline = new ExtraFields($db);
- $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
- $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
- $objectline->array_options=$array_options;
+ if ($fk_unit > 0) {
+ $objectline->fk_unit = GETPOST('unit');
+ } else {
+ $objectline->fk_unit = null;
+ }
- // TODO verifier price_min si fk_product et multiprix
+ // Extrafields
+ $extrafieldsline = new ExtraFields($db);
+ $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element);
+ $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+ $objectline->array_options=$array_options;
- $result=$objectline->update($user);
- if ($result > 0)
- {
- $db->commit();
- }
- else
- {
- setEventMessages($objectline->error, $objectline->errors, 'errors');
- $db->rollback();
- }
- }
- else
- {
- setEventMessages($objectline->error, $objectline->errors, 'errors');
- }
+ // TODO verifier price_min si fk_product et multiprix
+
+ $result=$objectline->update($user);
+ if ($result > 0)
+ {
+ $db->commit();
+ }
+ else
+ {
+ setEventMessages($objectline->error, $objectline->errors, 'errors');
+ $db->rollback();
+ }
+ }
+ else
+ {
+ setEventMessages($objectline->error, $objectline->errors, 'errors');
+ }
+ }
}
else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
@@ -1311,7 +1329,7 @@ else
// Contract card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 61cd62bd338..071ae75e5b7 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1938,19 +1938,29 @@ class Contrat extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param int $maxlength Max length of ref
- * @param int $notooltip 1=Disable tooltip
- * @return string Chaine avec URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $maxlength Max length of ref
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string Chaine avec URL
*/
- function getNomUrl($withpicto=0,$maxlength=0,$notooltip=0)
+ function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
{
global $conf, $langs, $user;
$result='';
$url = DOL_URL_ROOT.'/contrat/card.php?id='.$this->id;
- $picto = 'contract';
+
+ //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';
+ //}
+
+ $picto = 'contract';
$label = '';
if ($user->rights->contrat->lire) {
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 8510888cf35..aeb433cf455 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -134,9 +134,9 @@ if ($id > 0 || ! empty($ref))
// Contract card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
+
-
$morehtmlref='';
//if (! empty($modCodeContract->code_auto)) {
$morehtmlref.=$object->ref;
@@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
$morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
}*/
-
+
$morehtmlref.='';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
@@ -196,10 +196,10 @@ if ($id > 0 || ! empty($ref))
print '
';
print '
';
-
+
print '
';
-
+
// Ligne info remises tiers
print ''.$langs->trans('Discount').' ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
print '';
dol_fiche_end();
-
+
print ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
@@ -170,7 +170,7 @@ if ($object->id)
print '';
print '
';
-
+
print '
';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("BackToList").' ';
+$linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 64f2b6b94f2..dfc00f95e11 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -62,6 +62,9 @@ $socid=GETPOST('socid');
$search_user=GETPOST('search_user','int');
$search_sale=GETPOST('search_sale','int');
$search_product_category=GETPOST('search_product_category','int');
+$search_dfmonth=GETPOST('search_dfmonth','int');
+$search_dfyear=GETPOST('search_dfyear','int');
+$search_op2df=GETPOST('search_op2df');
$day=GETPOST("day","int");
$year=GETPOST("year","int");
$month=GETPOST("month","int");
@@ -126,6 +129,7 @@ $arrayfields=array(
'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1),
'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+ 'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900),
'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
);
// Extra fields
@@ -157,6 +161,9 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
$day='';
$month='';
$year='';
+ $search_dfmonth='';
+ $search_dfyear='';
+ $search_op2df='';
$search_name="";
$search_email="";
$search_town='';
@@ -205,6 +212,7 @@ $sql.= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_
$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
$sql.= " typent.code as typent_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
+$sql.= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
$sql.= ' SUM('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
$sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')",1,0).') as nb_running,';
$sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,';
@@ -278,10 +286,16 @@ $parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook
$sql.=$hookmanager->resPrint;
+if ($search_dfyear > 0)
+{
+// $sql.= " AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") ".$search_op2df."= '".$db->idate(($search_op2df == "<" ? dol_get_last_day($search_dfyear,$search_dfmonth,false) : dol_get_first_day($search_dfyear,$search_dfmonth,false)))."'";
+}
+
$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
$sql.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
$sql.= " typent.code,";
$sql.= " state.code_departement, state.nom";
+//$sql.= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").")";
// Add fields from extrafields
foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
// Add where from hooks
@@ -289,6 +303,11 @@ $parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters); // Note that $action and $object may have been modified by hook
$sql.=$hookmanager->resPrint;
+if ($search_dfyear > 0)
+{
+ $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") ".$search_op2df."= '".$db->idate(($search_op2df == "<" ? dol_get_last_day($search_dfyear,$search_dfmonth,false) : dol_get_first_day($search_dfyear,$search_dfmonth,false)))."'";
+}
+
$sql.= $db->order($sortfield,$sortorder);
$totalnboflines=0;
@@ -323,16 +342,22 @@ if ($resql)
}
$param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall != '') $param.='&sall='.$sall;
- if ($search_contract != '') $param.='&search_contract='.$search_contract;
- if ($search_name != '') $param.='&search_name='.$search_name;
- if ($search_email != '') $param.='&search_email='.$search_email;
- if ($search_ref_supplier != '') $param.='&search_ref_supplier='.$search_ref_supplier;
- if ($search_sale != '') $param.='&search_sale=' .$search_sale;
- if ($show_files) $param.='&show_files=' .$show_files;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($sall != '') $param.='&sall='.urlencode($sall);
+ if ($search_contract != '') $param.='&search_contract='.urlencode($search_contract);
+ if ($search_name != '') $param.='&search_name='.urlencode($search_name);
+ if ($search_email != '') $param.='&search_email='.urlencode($search_email);
+ if ($search_ref_customer != '') $param.='&search_ref_customer='.urlencode($search_ref_customer);
+ if ($search_ref_supplier != '') $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
+ if ($search_op2df != '') $param.='&search_op2df='.urlencode($search_op2df);
+ if ($search_dfyear != '') $param.='&search_dfyear='.urlencode($search_dfyear);
+ if ($search_dfmonth != '') $param.='&search_dfmonth='.urlencode($search_dfmonth);
+ if ($search_sale != '') $param.='&search_sale=' .urlencode($search_sale);
+ if ($search_user != '') $param.='&search_user=' .urlencode($search_user);
+ if ($search_product_category != '') $param.='&search_product_category=' .urlencode($search_product_category);
+ if ($show_files) $param.='&show_files=' .urlencode($show_files);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
// Add $param from extra fields
foreach ($search_array_options as $key => $val)
{
@@ -537,6 +562,18 @@ if ($resql)
print '';
print ' ';
}
+ // First end date
+ if (! empty($arrayfields['lower_planned_end_date']['checked']))
+ {
+ print '';
+ $arrayofoperators=array('<'=>'<','>'=>'>');
+ print $form->selectarray('search_op2df',$arrayofoperators,$search_op2df,0);
+ print '';
+ print $formother->select_month($search_dfmonth, 'search_dfmonth', 1);
+ print ' ';
+ $formother->select_year($search_dfyear, 'search_dfyear', 1, 20, 5);
+ print ' ';
+ }
// Status
if (! empty($arrayfields['status']['checked']))
{
@@ -581,6 +618,7 @@ if ($resql)
print $hookmanager->resPrint;
if (! empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+ if (! empty($arrayfields['lower_planned_end_date']['checked'])) print_liste_field_titre($arrayfields['lower_planned_end_date']['label'],$_SERVER["PHP_SELF"],"lower_planned_end_date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
if (! empty($arrayfields['status']['checked']))
{
print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
@@ -600,6 +638,11 @@ if ($resql)
$contracttmp->ref_customer=$obj->ref_customer;
$contracttmp->ref_supplier=$obj->ref_supplier;
+ if ($obj->socid > 0)
+ {
+ $result=$socstatic->fetch($obj->socid);
+ }
+
print '';
if (! empty($arrayfields['c.ref']['checked']))
{
@@ -631,7 +674,13 @@ if ($resql)
}
if (! empty($arrayfields['s.nom']['checked']))
{
- print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.' ';
+ //print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.' ';
+ if ($obj->socid > 0)
+ {
+ print $socstatic->getNomUrl(1, '');
+ }
+ print ' ';
}
if (! empty($arrayfields['s.email']['checked']))
{
@@ -683,7 +732,6 @@ if ($resql)
print '';
if ($obj->socid > 0)
{
- $result=$socstatic->fetch($obj->socid);
$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
if ($listsalesrepresentatives < 0) dol_print_error($db);
$nbofsalesrepresentative=count($listsalesrepresentatives);
@@ -759,6 +807,14 @@ if ($resql)
print ' ';
if (! $i) $totalarray['nbfield']++;
}
+ // Date lower end date
+ if (! empty($arrayfields['lower_planned_end_date']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day');
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Status
if (! empty($arrayfields['status']['checked']))
{
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 7d4927d19b8..ff0df34de67 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
// Contract card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
@@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref))
print '';
-
+
// Ligne info remises tiers
print ''.$langs->trans('Discount').' ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -161,9 +161,9 @@ if ($id > 0 || ! empty($ref))
print '
";
-
+
print '';
-
+
//print '
* Copyright (C) 2016 Bahfir abbes
* Copyright (C) 2017 ATM Consulting
+ * Copyright (C) 2017 Nicolas ZABOURI
*
* 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
@@ -39,24 +40,24 @@
*/
abstract class CommonObject
{
- /**
- * @var DoliDb Database handler (result of a new DoliDB)
- */
+ /**
+ * @var DoliDb Database handler (result of a new DoliDB)
+ */
public $db;
/**
* @var int The object identifier
*/
public $id;
- /**
- * @var string Error string
- * @deprecated Use instead the array of error strings
- * @see errors
- */
- public $error;
/**
- * @var string[] Array of error strings
- */
- public $errors=array();
+ * @var string Error string
+ * @deprecated Use instead the array of error strings
+ * @see errors
+ */
+ public $error;
+ /**
+ * @var string[] Array of error strings
+ */
+ public $errors=array();
/**
* @var string
*/
@@ -69,45 +70,45 @@ abstract class CommonObject
* @var
*/
public $table_element_line;
- /**
- * @var string Key value used to track if data is coming from import wizard
- */
- public $import_key;
- /**
- * @var mixed Contains data to manage extrafields
- */
- public $array_options=array();
- /**
- * @var int[] Array of linked objects ids. Loaded by ->fetchObjectLinked
- */
- public $linkedObjectsIds;
- /**
- * @var mixed Array of linked objects. Loaded by ->fetchObjectLinked
- */
- public $linkedObjects;
- /**
- * @var Object To store a cloned copy of object before to edit it and keep track of old properties
- */
- public $oldcopy;
+ /**
+ * @var string Key value used to track if data is coming from import wizard
+ */
+ public $import_key;
+ /**
+ * @var mixed Contains data to manage extrafields
+ */
+ public $array_options=array();
+ /**
+ * @var int[] Array of linked objects ids. Loaded by ->fetchObjectLinked
+ */
+ public $linkedObjectsIds;
+ /**
+ * @var mixed Array of linked objects. Loaded by ->fetchObjectLinked
+ */
+ public $linkedObjects;
+ /**
+ * @var Object To store a cloned copy of object before to edit it and keep track of old properties
+ */
+ public $oldcopy;
- /**
- * @var string Column name of the ref field.
- */
- protected $table_ref_field = '';
+ /**
+ * @var string Column name of the ref field.
+ */
+ protected $table_ref_field = '';
- // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
+ // Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
- /**
- * @var string[] Can be used to pass information when only object is provided to method
- */
- public $context=array();
+ /**
+ * @var string[] Can be used to pass information when only object is provided to method
+ */
+ public $context=array();
- /**
- * @var string Contains canvas name if record is an alternative canvas record
- */
- public $canvas;
+ /**
+ * @var string Contains canvas name if record is an alternative canvas record
+ */
+ public $canvas;
/**
* @var Project The related project
@@ -309,6 +310,12 @@ abstract class CommonObject
*/
public $lines;
+ /**
+ * @var mixed Contains comments
+ * @see fetchComments()
+ */
+ public $comments=array();
+
/**
* @var int
* @see setIncoterms()
@@ -325,13 +332,13 @@ abstract class CommonObject
*/
public $location_incoterms;
- public $name;
- public $lastname;
- public $firstname;
- public $civility_id;
+ public $name;
+ public $lastname;
+ public $firstname;
+ public $civility_id;
- // No constructor as it is an abstract class
+ // No constructor as it is an abstract class
/**
@@ -383,84 +390,84 @@ abstract class CommonObject
return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');
}
- /**
- * Return full name (civility+' '+name+' '+lastname)
- *
- * @param Translate $langs Language object for translation of civility
- * @param int $option 0=No option, 1=Add civility
- * @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname
- * @param int $maxlen Maximum length
- * @return string String with full name
- */
- function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)
- {
- //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."';
+ print ' ';
- if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' ';
+ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' ';
- // Description
- print ''.$langs->trans('Description').' ';
+ // Description
+ print ''.$langs->trans('Description').' ';
- if ($this->element == 'supplier_proposal')
- {
- print ''.$langs->trans("SupplierProposalRefFourn").' '.$langs->trans("SupplierProposalRefFourn").' '.$langs->trans('VAT').' ';
+ // VAT
+ print ''.$langs->trans('VAT').' ';
- // Price HT
- print ''.$langs->trans('PriceUHT').' ';
+ // Price HT
+ print ''.$langs->trans('PriceUHT').' ';
- // Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' ';
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' ';
- if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' ';
+ if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' ';
- // Qty
- print ''.$langs->trans('Qty').' ';
+ // Qty
+ print ''.$langs->trans('Qty').' ';
- if($conf->global->PRODUCT_USE_UNITS)
- {
- print ''.$langs->trans('Unit').' ';
- }
+ if($conf->global->PRODUCT_USE_UNITS)
+ {
+ print ''.$langs->trans('Unit').' ';
+ }
- // Reduction short
- print ''.$langs->trans('ReductionShort').' ';
+ // Reduction short
+ print ''.$langs->trans('ReductionShort').' ';
- if ($this->situation_cycle_ref) {
- print '' . $langs->trans('Progress') . ' ';
- }
+ if ($this->situation_cycle_ref) {
+ print '' . $langs->trans('Progress') . ' ';
+ }
- if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
- {
- if (!empty($user->rights->margins->creer))
- {
- if ($conf->global->MARGIN_TYPE == "1")
- print ''.$langs->trans('BuyingPrice').' ';
- else
- print ''.$langs->trans('CostPrice').' ';
- }
+ if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+ {
+ if (!empty($user->rights->margins->creer))
+ {
+ if ($conf->global->MARGIN_TYPE == "1")
+ print ''.$langs->trans('BuyingPrice').' ';
+ else
+ print ''.$langs->trans('CostPrice').' ';
+ }
- if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
- print ''.$langs->trans('MarginRate').' ';
- if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
- print ''.$langs->trans('MarkRate').' ';
- }
+ if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
+ print ''.$langs->trans('MarginRate').' ';
+ if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
+ print ''.$langs->trans('MarkRate').' ';
+ }
- // Total HT
- print ''.$langs->trans('TotalHTShort').' ';
+ // Total HT
+ print ''.$langs->trans('TotalHTShort').' ';
- // Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' ';
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' ';
- if ($outputalsopricetotalwithtax) print ''.$langs->trans('TotalTTCShort').' ';
+ if ($outputalsopricetotalwithtax) print ''.$langs->trans('TotalTTCShort').' ';
- print ' \n";
+ print " \n";
}
$var = true;
@@ -3463,20 +3496,20 @@ abstract class CommonObject
//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
- if (is_object($hookmanager)) // Old code is commented on preceding line.
+ if (is_object($hookmanager)) // Old code is commented on preceding line.
{
if (empty($line->fk_parent_line))
{
$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
- $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
}
else
{
$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
- $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
}
}
- if (empty($reshook))
+ if (empty($reshook))
{
$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);
}
@@ -3528,8 +3561,8 @@ abstract class CommonObject
$product_static = new Product($this->db);
$product_static->fetch($line->fk_product);
- $product_static->ref = $line->ref; //can change ref in hook
- $product_static->label = $line->label; //can change label in hook
+ $product_static->ref = $line->ref; //can change ref in hook
+ $product_static->label = $line->label; //can change label in hook
$text=$product_static->getNomUrl(1);
// Define output language and label
@@ -3608,74 +3641,74 @@ abstract class CommonObject
}
- /* This is to show array of line of details of source object */
+ /* This is to show array of line of details of source object */
- /**
- * Return HTML table table of source object lines
- * TODO Move this and previous function into output html class file (htmlline.class.php).
- * If lines are into a template, title must also be into a template
- * But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
- *
- * @return void
- */
- function printOriginLinesList()
- {
- global $langs, $hookmanager, $conf;
+ /**
+ * Return HTML table table of source object lines
+ * TODO Move this and previous function into output html class file (htmlline.class.php).
+ * If lines are into a template, title must also be into a template
+ * But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
+ *
+ * @return void
+ */
+ function printOriginLinesList()
+ {
+ global $langs, $hookmanager, $conf;
- print '';
- print ''.$langs->trans('Ref').' ';
- print ''.$langs->trans('Description').' ';
- print ''.$langs->trans('VATRate').' ';
- print ''.$langs->trans('PriceUHT').' ';
+ print ' ';
+ print ''.$langs->trans('Ref').' ';
+ print ''.$langs->trans('Description').' ';
+ print ''.$langs->trans('VATRate').' ';
+ print ''.$langs->trans('PriceUHT').' ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('PriceUHTCurrency').' ';
- print ''.$langs->trans('Qty').' ';
- if($conf->global->PRODUCT_USE_UNITS)
- {
- print ''.$langs->trans('Unit').' ';
- }
- print ''.$langs->trans('ReductionShort').' ';
+ print ''.$langs->trans('Qty').' ';
+ if($conf->global->PRODUCT_USE_UNITS)
+ {
+ print ''.$langs->trans('Unit').' ';
+ }
+ print ''.$langs->trans('ReductionShort').' ';
- $var = true;
- $i = 0;
+ $var = true;
+ $i = 0;
- foreach ($this->lines as $line)
- {
+ foreach ($this->lines as $line)
+ {
- if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
- {
- if (empty($line->fk_parent_line))
- {
- $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
- $action='';
- $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- }
- }
- else
- {
- $this->printOriginLine($line,$var);
- }
+ if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+ {
+ if (empty($line->fk_parent_line))
+ {
+ $parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
+ $action='';
+ $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ }
+ }
+ else
+ {
+ $this->printOriginLine($line,$var);
+ }
- $i++;
- }
- }
+ $i++;
+ }
+ }
- /**
- * Return HTML with a line of table array of source object lines
- * TODO Move this and previous function into output html class file (htmlline.class.php).
- * If lines are into a template, title must also be into a template
- * But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
- *
- * @param CommonObjectLine $line Line
- * @param string $var Var
- * @return void
- */
- function printOriginLine($line,$var)
- {
- global $langs, $conf;
+ /**
+ * Return HTML with a line of table array of source object lines
+ * TODO Move this and previous function into output html class file (htmlline.class.php).
+ * If lines are into a template, title must also be into a template
+ * But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
+ *
+ * @param CommonObjectLine $line Line
+ * @param string $var Var
+ * @return void
+ */
+ function printOriginLine($line,$var)
+ {
+ global $langs, $conf;
- //var_dump($line);
+ //var_dump($line);
if (!empty($line->date_start))
{
$date_start=$line->date_start;
@@ -3695,98 +3728,98 @@ abstract class CommonObject
if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
}
- $this->tpl['label'] = '';
- if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+ $this->tpl['label'] = '';
+ if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
- if (($line->info_bits & 2) == 2) // TODO Not sure this is used for source object
- {
- $discount=new DiscountAbsolute($this->db);
- $discount->fk_soc = $this->socid;
- $this->tpl['label'].= $discount->getNomUrl(0,'discount');
- }
- else if (! empty($line->fk_product))
- {
- $productstatic = new Product($this->db);
- $productstatic->id = $line->fk_product;
- $productstatic->ref = $line->ref;
- $productstatic->type = $line->fk_product_type;
- $this->tpl['label'].= $productstatic->getNomUrl(1);
- $this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
- // Dates
- if ($line->product_type == 1 && ($date_start || $date_end))
- {
- $this->tpl['label'].= get_date_range($date_start,$date_end);
- }
- }
- else
- {
- $this->tpl['label'].= ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
- if (!empty($line->desc)) {
- $this->tpl['label'].=$line->desc;
- }else {
- $this->tpl['label'].= ($line->label ? ' '.$line->label : '');
- }
- // Dates
- if ($line->product_type == 1 && ($date_start || $date_end))
- {
- $this->tpl['label'].= get_date_range($date_start,$date_end);
- }
- }
+ if (($line->info_bits & 2) == 2) // TODO Not sure this is used for source object
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fk_soc = $this->socid;
+ $this->tpl['label'].= $discount->getNomUrl(0,'discount');
+ }
+ else if (! empty($line->fk_product))
+ {
+ $productstatic = new Product($this->db);
+ $productstatic->id = $line->fk_product;
+ $productstatic->ref = $line->ref;
+ $productstatic->type = $line->fk_product_type;
+ $this->tpl['label'].= $productstatic->getNomUrl(1);
+ $this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+ // Dates
+ if ($line->product_type == 1 && ($date_start || $date_end))
+ {
+ $this->tpl['label'].= get_date_range($date_start,$date_end);
+ }
+ }
+ else
+ {
+ $this->tpl['label'].= ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
+ if (!empty($line->desc)) {
+ $this->tpl['label'].=$line->desc;
+ }else {
+ $this->tpl['label'].= ($line->label ? ' '.$line->label : '');
+ }
+ // Dates
+ if ($line->product_type == 1 && ($date_start || $date_end))
+ {
+ $this->tpl['label'].= get_date_range($date_start,$date_end);
+ }
+ }
- if (! empty($line->desc))
- {
- if ($line->desc == '(CREDIT_NOTE)') // TODO Not sure this is used for source object
- {
- $discount=new DiscountAbsolute($this->db);
- $discount->fetch($line->fk_remise_except);
- $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
- }
- elseif ($line->desc == '(DEPOSIT)') // TODO Not sure this is used for source object
- {
- $discount=new DiscountAbsolute($this->db);
- $discount->fetch($line->fk_remise_except);
- $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
- }
- elseif ($line->desc == '(EXCESS RECEIVED)')
- {
- $discount=new DiscountAbsolute($this->db);
- $discount->fetch($line->fk_remise_except);
- $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
- }
- else
- {
- $this->tpl['description'] = dol_trunc($line->desc,60);
- }
- }
- else
- {
- $this->tpl['description'] = ' ';
- }
+ if (! empty($line->desc))
+ {
+ if ($line->desc == '(CREDIT_NOTE)') // TODO Not sure this is used for source object
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+ }
+ elseif ($line->desc == '(DEPOSIT)') // TODO Not sure this is used for source object
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+ }
+ elseif ($line->desc == '(EXCESS RECEIVED)')
+ {
+ $discount=new DiscountAbsolute($this->db);
+ $discount->fetch($line->fk_remise_except);
+ $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+ }
+ else
+ {
+ $this->tpl['description'] = dol_trunc($line->desc,60);
+ }
+ }
+ else
+ {
+ $this->tpl['description'] = ' ';
+ }
- // VAT Rate
- $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
- if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+ // VAT Rate
+ $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+ if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
- $this->tpl['price'] = price($line->subprice);
+ $this->tpl['price'] = price($line->subprice);
$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
- $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' ';
- if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->getLabelOfUnit('long');
- $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' ';
+ $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' ';
+ if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->getLabelOfUnit('long');
+ $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' ';
- // Output template part (modules that overwrite templates must declare this into descriptor)
- // Use global variables + $dateSelector + $seller and $buyer
- $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
- foreach($dirtpls as $reldir)
- {
- $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
- if (empty($conf->file->strict_mode)) {
- $res=@include $tpl;
- } else {
- $res=include $tpl; // for debug
- }
- if ($res) break;
- }
- }
+ // Output template part (modules that overwrite templates must declare this into descriptor)
+ // Use global variables + $dateSelector + $seller and $buyer
+ $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+ foreach($dirtpls as $reldir)
+ {
+ $tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
+ if (empty($conf->file->strict_mode)) {
+ $res=@include $tpl;
+ } else {
+ $res=include $tpl; // for debug
+ }
+ if ($res) break;
+ }
+ }
/**
@@ -3843,32 +3876,32 @@ abstract class CommonObject
*/
function delete_resource($rowid, $element, $notrigger=0)
{
- global $user;
+ global $user;
- $this->db->begin();
+ $this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
- $sql.= " WHERE rowid=".$rowid;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
+ $sql.= " WHERE rowid=".$rowid;
- dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
- {
- $this->error=$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- else
- {
- if (! $notrigger)
- {
- $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
- if ($result < 0) { $this->db->rollback(); return -1; }
- }
- $this->db->commit();
- return 1;
- }
+ $resql=$this->db->query($sql);
+ if (! $resql)
+ {
+ $this->error=$this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ else
+ {
+ if (! $notrigger)
+ {
+ $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+ if ($result < 0) { $this->db->rollback(); return -1; }
+ }
+ $this->db->commit();
+ return 1;
+ }
}
@@ -3878,17 +3911,17 @@ abstract class CommonObject
* @return void
*/
function __clone()
- {
- // Force a copy of this->lines, otherwise it will point to same object.
- if (isset($this->lines) && is_array($this->lines))
- {
- $nboflines=count($this->lines);
- for($i=0; $i < $nboflines; $i++)
- {
- $this->lines[$i] = clone $this->lines[$i];
- }
- }
- }
+ {
+ // Force a copy of this->lines, otherwise it will point to same object.
+ if (isset($this->lines) && is_array($this->lines))
+ {
+ $nboflines=count($this->lines);
+ for($i=0; $i < $nboflines; $i++)
+ {
+ $this->lines[$i] = clone $this->lines[$i];
+ }
+ }
+ }
/**
* Common function for all objects extending CommonObject for generating documents
@@ -3930,7 +3963,7 @@ abstract class CommonObject
{
foreach(array('doc','pdf') as $prefix)
{
- if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
+ if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
else $file = $prefix."_".$modele.".modules.php";
// On verifie l'emplacement du modele
@@ -3965,27 +3998,27 @@ abstract class CommonObject
$listoffiles=array();
// Now we add first model found in directories scanned
- $listofdir=explode(',',$dirtoscan);
- foreach($listofdir as $key => $tmpdir)
- {
- $tmpdir=trim($tmpdir);
- $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
- if (! $tmpdir) { unset($listofdir[$key]); continue; }
- if (is_dir($tmpdir))
- {
- $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
- if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
- }
- }
+ $listofdir=explode(',',$dirtoscan);
+ foreach($listofdir as $key => $tmpdir)
+ {
+ $tmpdir=trim($tmpdir);
+ $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+ if (! $tmpdir) { unset($listofdir[$key]); continue; }
+ if (is_dir($tmpdir))
+ {
+ $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
+ if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+ }
+ }
- if (count($listoffiles))
- {
- foreach($listoffiles as $record)
- {
- $srctemplatepath=$record['fullname'];
- break;
- }
- }
+ if (count($listoffiles))
+ {
+ foreach($listoffiles as $record)
+ {
+ $srctemplatepath=$record['fullname'];
+ break;
+ }
+ }
}
if (empty($srctemplatepath))
@@ -3995,14 +4028,14 @@ abstract class CommonObject
}
}
- if ($obj->type == 'odt' && ! empty($srctemplatepath))
- {
- if (! dol_is_file($srctemplatepath))
- {
- $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
- return -1;
- }
- }
+ if ($obj->type == 'odt' && ! empty($srctemplatepath))
+ {
+ if (! dol_is_file($srctemplatepath))
+ {
+ $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+ return -1;
+ }
+ }
// We save charset_output to restore it because write_file can change it if needed for
// output format that does not support UTF8.
@@ -4010,8 +4043,8 @@ abstract class CommonObject
if (in_array(get_class($this), array('Adherent')))
{
- $arrayofrecords = array(); // The write_file of templates of adherent class need this
- $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
+ $arrayofrecords = array(); // The write_file of templates of adherent class need this
+ $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
}
else
{
@@ -4115,190 +4148,190 @@ abstract class CommonObject
if (file_exists($file_osencoded))
{
// Create small thumbs for company (Ratio is near 16/9)
- // Used on logon for example
- vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+ // Used on logon for example
+ vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
- // Create mini thumbs for company (Ratio is near 16/9)
- // Used on menu or for setup page for example
- vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
+ // Create mini thumbs for company (Ratio is near 16/9)
+ // Used on menu or for setup page for example
+ vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
}
}
/* Functions common to commonobject and commonobjectline */
- /* For default values */
+ /* For default values */
- /**
- * Return the default value to use for a field when showing the create form of object.
- * Return values in this order:
- * 1) If parameter is available into POST, we return it first.
- * 2) If not but an alternate value was provided as parameter of function, we return it.
- * 3) If not but a constant $conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).
- * 4) Return value found into database (TODO No yet implemented)
- *
- * @param string $fieldname Name of field
- * @param string $alternatevalue Alternate value to use
- * @return string|string[] Default value (can be an array if the GETPOST return an array)
- **/
+ /**
+ * Return the default value to use for a field when showing the create form of object.
+ * Return values in this order:
+ * 1) If parameter is available into POST, we return it first.
+ * 2) If not but an alternate value was provided as parameter of function, we return it.
+ * 3) If not but a constant $conf->global->OBJECTELEMENT_FIELDNAME is set, we return it (It is better to use the dedicated table).
+ * 4) Return value found into database (TODO No yet implemented)
+ *
+ * @param string $fieldname Name of field
+ * @param string $alternatevalue Alternate value to use
+ * @return string|string[] Default value (can be an array if the GETPOST return an array)
+ **/
function getDefaultCreateValueFor($fieldname, $alternatevalue=null)
- {
- global $conf, $_POST;
+ {
+ global $conf, $_POST;
- // If param here has been posted, we use this value first.
- if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+ // If param here has been posted, we use this value first.
+ if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
- if (isset($alternatevalue)) return $alternatevalue;
+ if (isset($alternatevalue)) return $alternatevalue;
- $newelement=$this->element;
- if ($newelement == 'facture') $newelement='invoice';
- if ($newelement == 'commande') $newelement='order';
- if (empty($newelement))
- {
- dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
- return '';
- }
+ $newelement=$this->element;
+ if ($newelement == 'facture') $newelement='invoice';
+ if ($newelement == 'commande') $newelement='order';
+ if (empty($newelement))
+ {
+ dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
+ return '';
+ }
- $keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
- //var_dump($keyforfieldname);
- if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+ $keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
+ //var_dump($keyforfieldname);
+ if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
- // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
+ // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
- }
+ }
/* For triggers */
- /**
- * Call trigger based on this instance.
- * Some context information may also be provided into array property this->context.
- * NB: Error from trigger are stacked in interface->errors
- * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
- *
- * @param string $trigger_name trigger's name to execute
- * @param User $user Object user
- * @return int Result of run_triggers
- */
- function call_trigger($trigger_name, $user)
- {
- global $langs,$conf;
+ /**
+ * Call trigger based on this instance.
+ * Some context information may also be provided into array property this->context.
+ * NB: Error from trigger are stacked in interface->errors
+ * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
+ *
+ * @param string $trigger_name trigger's name to execute
+ * @param User $user Object user
+ * @return int Result of run_triggers
+ */
+ function call_trigger($trigger_name, $user)
+ {
+ global $langs,$conf;
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
- if ($result < 0)
- {
- if (!empty($this->errors))
- {
- $this->errors=array_unique(array_merge($this->errors,$interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
- }
- else
- {
- $this->errors=$interface->errors;
- }
- }
- return $result;
- }
+ if ($result < 0)
+ {
+ if (!empty($this->errors))
+ {
+ $this->errors=array_unique(array_merge($this->errors,$interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+ }
+ else
+ {
+ $this->errors=$interface->errors;
+ }
+ }
+ return $result;
+ }
- /* Functions for extrafields */
+ /* Functions for extrafields */
- /**
- * Function to get extra fields of a member into $this->array_options
- * This method is in most cases called by method fetch of objects but you can call it separately.
- *
- * @param int $rowid Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
- * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
- * @return int <0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
- */
- function fetch_optionals($rowid=null,$optionsArray=null)
- {
- if (empty($rowid)) $rowid=$this->id;
+ /**
+ * Function to get extra fields of a member into $this->array_options
+ * This method is in most cases called by method fetch of objects but you can call it separately.
+ *
+ * @param int $rowid Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
+ * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
+ * @return int <0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
+ */
+ function fetch_optionals($rowid=null,$optionsArray=null)
+ {
+ if (empty($rowid)) $rowid=$this->id;
- // To avoid SQL errors. Probably not the better solution though
- if (!$this->table_element) {
- return 0;
- }
+ // To avoid SQL errors. Probably not the better solution though
+ if (!$this->table_element) {
+ return 0;
+ }
- if (! is_array($optionsArray))
- {
- // If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
- // TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
- // global $extrafields;
- //if (! is_object($extrafields))
- //{
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields = new ExtraFields($this->db);
- //}
+ if (! is_array($optionsArray))
+ {
+ // If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
+ // TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
+ // global $extrafields;
+ //if (! is_object($extrafields))
+ //{
+ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+ $extrafields = new ExtraFields($this->db);
+ //}
- // Load array of extrafields for elementype = $this->table_element
- if (empty($extrafields->attributes[$this->table_element]['loaded']))
- {
- $extrafields->fetch_name_optionals_label($this->table_element);
- }
- $optionsArray = $extrafields->attributes[$this->table_element]['label'];
- }
+ // Load array of extrafields for elementype = $this->table_element
+ if (empty($extrafields->attributes[$this->table_element]['loaded']))
+ {
+ $extrafields->fetch_name_optionals_label($this->table_element);
+ }
+ $optionsArray = $extrafields->attributes[$this->table_element]['label'];
+ }
- $table_element = $this->table_element;
- if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+ $table_element = $this->table_element;
+ if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
- // Request to get complementary values
- if (is_array($optionsArray) && count($optionsArray) > 0)
- {
- $sql = "SELECT rowid";
- foreach ($optionsArray as $name => $label)
- {
- if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
- {
- $sql.= ", ".$name;
- }
- }
- $sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
- $sql.= " WHERE fk_object = ".$rowid;
+ // Request to get complementary values
+ if (is_array($optionsArray) && count($optionsArray) > 0)
+ {
+ $sql = "SELECT rowid";
+ foreach ($optionsArray as $name => $label)
+ {
+ if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
+ {
+ $sql.= ", ".$name;
+ }
+ }
+ $sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+ $sql.= " WHERE fk_object = ".$rowid;
- dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $numrows=$this->db->num_rows($resql);
- if ($numrows)
- {
- $tab = $this->db->fetch_array($resql);
+ dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $numrows=$this->db->num_rows($resql);
+ if ($numrows)
+ {
+ $tab = $this->db->fetch_array($resql);
- foreach ($tab as $key => $value)
- {
- // Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
- if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
- {
- // we can add this attribute to object
- $this->array_options["options_".$key]=$value;
- }
- }
- }
+ foreach ($tab as $key => $value)
+ {
+ // Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
+ if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+ {
+ // we can add this attribute to object
+ $this->array_options["options_".$key]=$value;
+ }
+ }
+ }
- $this->db->free($resql);
+ $this->db->free($resql);
- if ($numrows) return $numrows;
- else return 0;
- }
- else
- {
- dol_print_error($this->db);
- return -1;
- }
- }
- return 0;
- }
+ if ($numrows) return $numrows;
+ else return 0;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+ return 0;
+ }
- /**
- * Delete all extra fields values for the current object.
- *
- * @return int <0 if KO, >0 if OK
- */
+ /**
+ * Delete all extra fields values for the current object.
+ *
+ * @return int <0 if KO, >0 if OK
+ */
function deleteExtraFields()
{
$this->db->begin();
@@ -4322,255 +4355,255 @@ abstract class CommonObject
}
}
- /**
- * Add/Update all extra fields values for the current object.
- * Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
- * This function delete record with all extrafields and insert them again from the array $this->array_options.
- *
- * @return int -1=error, O=did nothing, 1=OK
- */
- function insertExtraFields()
- {
- global $conf,$langs;
+ /**
+ * Add/Update all extra fields values for the current object.
+ * Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+ * This function delete record with all extrafields and insert them again from the array $this->array_options.
+ *
+ * @return int -1=error, O=did nothing, 1=OK
+ */
+ function insertExtraFields()
+ {
+ global $conf,$langs;
$error=0;
if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
- if (! empty($this->array_options))
- {
- // Check parameters
- $langs->load('admin');
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields = new ExtraFields($this->db);
- $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+ if (! empty($this->array_options))
+ {
+ // Check parameters
+ $langs->load('admin');
+ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+ $extrafields = new ExtraFields($this->db);
+ $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
- //Eliminate copied source object extra_fields that do not exist in target object
- $new_array_options=array();
- foreach ($this->array_options as $key => $value) {
- if (in_array(substr($key,8), array_keys($target_extrafields)))
- $new_array_options[$key] = $value;
- }
+ //Eliminate copied source object extra_fields that do not exist in target object
+ $new_array_options=array();
+ foreach ($this->array_options as $key => $value) {
+ if (in_array(substr($key,8), array_keys($target_extrafields)))
+ $new_array_options[$key] = $value;
+ }
- foreach($new_array_options as $key => $value)
- {
- $attributeKey = substr($key,8); // Remove 'options_' prefix
- $attributeType = $extrafields->attribute_type[$attributeKey];
- $attributeLabel = $extrafields->attribute_label[$attributeKey];
- $attributeParam = $extrafields->attribute_param[$attributeKey];
- switch ($attributeType)
- {
- case 'int':
- if (!is_numeric($value) && $value!='')
- {
- $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
- return -1;
- }
- elseif ($value=='')
- {
- $new_array_options[$key] = null;
- }
- break;
- /*case 'select': // Not required, we chosed value='0' for undefined values
+ foreach($new_array_options as $key => $value)
+ {
+ $attributeKey = substr($key,8); // Remove 'options_' prefix
+ $attributeType = $extrafields->attribute_type[$attributeKey];
+ $attributeLabel = $extrafields->attribute_label[$attributeKey];
+ $attributeParam = $extrafields->attribute_param[$attributeKey];
+ switch ($attributeType)
+ {
+ case 'int':
+ if (!is_numeric($value) && $value!='')
+ {
+ $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+ return -1;
+ }
+ elseif ($value=='')
+ {
+ $new_array_options[$key] = null;
+ }
+ break;
+ /*case 'select': // Not required, we chosed value='0' for undefined values
if ($value=='-1')
{
$this->array_options[$key] = null;
}
break;*/
- case 'price':
- $new_array_options[$key] = price2num($this->array_options[$key]);
- break;
- case 'date':
- $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
- break;
- case 'datetime':
- $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
- break;
- case 'link':
+ case 'price':
+ $new_array_options[$key] = price2num($this->array_options[$key]);
+ break;
+ case 'date':
+ $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
+ break;
+ case 'datetime':
+ $new_array_options[$key] = $this->db->idate($this->array_options[$key]);
+ break;
+ case 'link':
$param_list=array_keys($attributeParam ['options']);
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
dol_include_once($InfoFieldList[1]);
- if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
- {
- $object = new $InfoFieldList[0]($this->db);
- if ($value)
- {
- if (is_numeric($value)) $res=$object->fetch($value);
+ if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
+ {
+ $object = new $InfoFieldList[0]($this->db);
+ if ($value)
+ {
+ if (is_numeric($value)) $res=$object->fetch($value);
else $res=$object->fetch('',$value);
- if ($res > 0) $new_array_options[$key]=$object->id;
- else
- {
- $this->error="Ref '".$value."' for object '".$object->element."' not found";
- $this->db->rollback();
- return -1;
- }
- }
- }
- else
- {
- dol_syslog('Error bad setup of extrafield', LOG_WARNING);
- }
+ if ($res > 0) $new_array_options[$key]=$object->id;
+ else
+ {
+ $this->error="Ref '".$value."' for object '".$object->element."' not found";
+ $this->db->rollback();
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ dol_syslog('Error bad setup of extrafield', LOG_WARNING);
+ }
break;
- }
- }
- $this->db->begin();
+ }
+ }
+ $this->db->begin();
- $table_element = $this->table_element;
- if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+ $table_element = $this->table_element;
+ if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
- dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
- $this->db->query($sql_del);
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
+ dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
+ $this->db->query($sql_del);
- $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
- foreach($new_array_options as $key => $value)
- {
- $attributeKey = substr($key,8); // Remove 'options_' prefix
- // Add field of attribut
- if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
- $sql.=",".$attributeKey;
- }
- $sql .= ") VALUES (".$this->id;
- foreach($new_array_options as $key => $value)
- {
- $attributeKey = substr($key,8); // Remove 'options_' prefix
- // Add field o fattribut
- if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
- {
- if ($new_array_options[$key] != '')
- {
- $sql.=",'".$this->db->escape($new_array_options[$key])."'";
- }
- else
- {
- $sql.=",null";
- }
- }
- }
- $sql.=")";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
+ foreach($new_array_options as $key => $value)
+ {
+ $attributeKey = substr($key,8); // Remove 'options_' prefix
+ // Add field of attribut
+ if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
+ $sql.=",".$attributeKey;
+ }
+ $sql .= ") VALUES (".$this->id;
+ foreach($new_array_options as $key => $value)
+ {
+ $attributeKey = substr($key,8); // Remove 'options_' prefix
+ // Add field o fattribut
+ if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
+ {
+ if ($new_array_options[$key] != '')
+ {
+ $sql.=",'".$this->db->escape($new_array_options[$key])."'";
+ }
+ else
+ {
+ $sql.=",null";
+ }
+ }
+ }
+ $sql.=")";
- dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
- $resql = $this->db->query($sql);
- if (! $resql)
- {
- $this->error=$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- else
- {
- $this->db->commit();
- return 1;
- }
- }
- else return 0;
- }
+ dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (! $resql)
+ {
+ $this->error=$this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+ else return 0;
+ }
- /**
- * Update an exta field value for the current object.
- * Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
- * This function delte record with all extrafields and insert them again from the array $this->array_options.
- *
- * @param string $key Key of the extrafield
- * @return int -1=error, O=did nothing, 1=OK
- */
- function updateExtraField($key)
- {
- global $conf,$langs;
+ /**
+ * Update an exta field value for the current object.
+ * Data to describe values to insert/update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
+ * This function delte record with all extrafields and insert them again from the array $this->array_options.
+ *
+ * @param string $key Key of the extrafield
+ * @return int -1=error, O=did nothing, 1=OK
+ */
+ function updateExtraField($key)
+ {
+ global $conf,$langs;
$error=0;
if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
- if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
- {
- // Check parameters
- $langs->load('admin');
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields = new ExtraFields($this->db);
- $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+ if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
+ {
+ // Check parameters
+ $langs->load('admin');
+ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+ $extrafields = new ExtraFields($this->db);
+ $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
- $value=$this->array_options["options_".$key];
- $attributeType = $extrafields->attribute_type[$key];
- $attributeLabel = $extrafields->attribute_label[$key];
- $attributeParam = $extrafields->attribute_param[$key];
- switch ($attributeType)
- {
- case 'int':
- if (!is_numeric($value) && $value!='')
- {
- $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
- return -1;
- }
- elseif ($value=='')
- {
- $this->array_options["options_".$key] = null;
- }
- break;
- /*case 'select': // Not required, we chosed value='0' for undefined values
+ $value=$this->array_options["options_".$key];
+ $attributeType = $extrafields->attribute_type[$key];
+ $attributeLabel = $extrafields->attribute_label[$key];
+ $attributeParam = $extrafields->attribute_param[$key];
+ switch ($attributeType)
+ {
+ case 'int':
+ if (!is_numeric($value) && $value!='')
+ {
+ $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+ return -1;
+ }
+ elseif ($value=='')
+ {
+ $this->array_options["options_".$key] = null;
+ }
+ break;
+ /*case 'select': // Not required, we chosed value='0' for undefined values
if ($value=='-1')
{
$this->array_options[$key] = null;
}
break;*/
- case 'price':
- $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
- break;
- case 'date':
- $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
- break;
- case 'datetime':
- $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
- break;
- case 'link':
- $param_list=array_keys($attributeParam ['options']);
- // 0 : ObjectName
- // 1 : classPath
- $InfoFieldList = explode(":", $param_list[0]);
- dol_include_once($InfoFieldList[1]);
- $object = new $InfoFieldList[0]($this->db);
- if ($value)
- {
- $object->fetch(0,$value);
- $this->array_options["options_".$key]=$object->id;
- }
- break;
- }
+ case 'price':
+ $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
+ break;
+ case 'date':
+ $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+ break;
+ case 'datetime':
+ $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+ break;
+ case 'link':
+ $param_list=array_keys($attributeParam ['options']);
+ // 0 : ObjectName
+ // 1 : classPath
+ $InfoFieldList = explode(":", $param_list[0]);
+ dol_include_once($InfoFieldList[1]);
+ $object = new $InfoFieldList[0]($this->db);
+ if ($value)
+ {
+ $object->fetch(0,$value);
+ $this->array_options["options_".$key]=$object->id;
+ }
+ break;
+ }
- $this->db->begin();
- $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
- $sql .= " WHERE fk_object = ".$this->id;
- $resql = $this->db->query($sql);
- if (! $resql)
- {
- $this->error=$this->db->lasterror();
- $this->db->rollback();
- return -1;
- }
- else
- {
- $this->db->commit();
- return 1;
- }
- }
- else return 0;
- }
+ $this->db->begin();
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
+ $sql .= " WHERE fk_object = ".$this->id;
+ $resql = $this->db->query($sql);
+ if (! $resql)
+ {
+ $this->error=$this->db->lasterror();
+ $this->db->rollback();
+ return -1;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+ else return 0;
+ }
/**
- * Function to show lines of extrafields with output datas
- *
- * @param Extrafields $extrafields Extrafield Object
- * @param string $mode Show output (view) or input (edit) for extrafield
- * @param array $params Optional parameters
- * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names)
- *
- * @return string
- */
- function showOptionals($extrafields, $mode='view', $params=null, $keyprefix='')
- {
+ * Function to show lines of extrafields with output datas
+ *
+ * @param Extrafields $extrafields Extrafield Object
+ * @param string $mode Show output (view) or input (edit) for extrafield
+ * @param array $params Optional parameters
+ * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names)
+ *
+ * @return string
+ */
+ function showOptionals($extrafields, $mode='view', $params=null, $keyprefix='')
+ {
global $_POST, $conf, $langs;
$out = '';
@@ -4594,23 +4627,28 @@ abstract class CommonObject
}else {
$colspan='3';
}
+
switch($mode) {
case "view":
$value=$this->array_options["options_".$key];
break;
case "edit":
- if (isset($_POST["options_" . $key])) {
- if (is_array($_POST["options_" . $key])) {
- // $_POST["options"] is an array but following code expects a comma separated string
- $value = implode(",", $_POST["options_" . $key]);
+ // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
+ $getposttemp = GETPOST('options_'.$key, 'none'); // GETPOST can get value from GET, POST or setup of default values.
+ if (isset($getposttemp)) {
+ if (is_array($getposttemp)) {
+ // $getposttemp is an array but following code expects a comma separated string
+ $value = implode(",", $getposttemp);
} else {
- $value = $_POST["options_" . $key];
+ $value = $getposttemp;
}
} else {
- $value = $this->array_options["options_" . $key];
+ $value = $this->array_options["options_" . $key]; // No GET, no POST, no default value, so we take value of object.
}
break;
}
+ //var_dump($value);
+
if ($extrafields->attribute_type[$key] == 'separate')
{
$out .= $extrafields->showSeparator($key);
@@ -4633,13 +4671,19 @@ abstract class CommonObject
{
$out .= '