diff --git a/ChangeLog b/ChangeLog index 89b4eb2c689..8a6f62aacbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,11 @@ English Dolibarr ChangeLog - Fix: [ bug #855 ] Holiday approval email in French - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email - Fix: [ bug #857 ] Invoice created from shipment does not have the order discount +- Fix: [ bug #861 ] Impossible to create a new event in agenda +- Fix: [ bug #827 ] AJAX search does not respect multiprice level +- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work - Fix: [ bug #866 ] Standing order from an invoice suggests invoice total amount instead of remaining to pay +- Fix: [ bug #788 ] Date of linked interventions are not shown ***** ChangeLog for 3.3.1 compared to 3.3 ***** diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index a866b4cac79..c6007e05460 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -140,6 +140,8 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; + $langs->load('commercial'); + print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num); print '
'; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index bc69163e000..108ce0bb274 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -27,7 +27,7 @@ require '../bank/pre.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; -$langs->load("widthdrawals"); +$langs->load("withdrawals"); $langs->load("categories"); // Security check diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 0ec6018f9eb..3ede6674fd3 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("companies"); $langs->load("categories"); $langs->load('withdrawals'); +$langs->load('bills'); // Securite acces client if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index c88df2483a3..60f955eb670 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("categories"); $langs->load('withdrawals'); +$langs->load('bills'); // Securite acces client if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 28cf71231b5..7ec2bbe9a2c 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -33,6 +33,7 @@ if ($user->societe_id > 0) accessforbidden(); $langs->load("withdrawals"); $langs->load("categories"); +$langs->load('bills'); // Get supervariables $prev_id = GETPOST('id','int'); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 0f87e78213d..238cd21b98b 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -36,6 +36,7 @@ if ($user->societe_id > 0) accessforbidden(); $langs->load("categories"); $langs->load('withdrawals'); +$langs->load('bills'); // Get supervariables $prev_id = GETPOST('id','int'); diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index b22289b5f50..6cd04c95162 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -26,6 +26,7 @@ require '../bank/pre.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("withdrawals"); @@ -56,6 +57,7 @@ if ($sortorder == "") $sortorder="DESC"; if ($sortfield == "") $sortfield="p.datec"; $rej = new RejetPrelevement($db, $user); +$ligne = new LignePrelevement($db); /* * Liste des factures @@ -84,7 +86,7 @@ if ($result) print"\n\n"; print ''; print ''; - print_liste_field_titre($langs->trans("Nb"),"rejets.php","p.ref",'',$urladd); + print_liste_field_titre($langs->trans("Line"),"rejets.php","p.ref",'',$urladd); print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd); print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd); print ''; @@ -98,7 +100,7 @@ if ($result) $obj = $db->fetch_object($result); print ""; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 60186fe8aef..483301591d7 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -524,20 +524,20 @@ class Contrat extends CommonObject $objp = $this->db->fetch_object($result); $line = new ContratLigne($this->db); - $line->id = $objp->rowid; + $line->id = $objp->rowid; $line->fk_contrat = $objp->fk_contrat; $line->libelle = $objp->description; $line->desc = $objp->description; $line->qty = $objp->qty; - $line->statut = $objp->statut; - $line->ref = $objp->ref; + $line->statut = $objp->statut; + $line->ref = (isset($objp->ref)?$objp->ref:NULL); $line->tva_tx = $objp->tva_tx; $line->localtax1_tx = $objp->localtax1_tx; $line->localtax2_tx = $objp->localtax2_tx; $line->subprice = $objp->subprice; $line->remise_percent = $objp->remise_percent; $line->price_ht = $objp->price_ht; - $line->price = $objp->price; // For backward compatibility + $line->price = (isset($objp->price)?$objp->price:NULL); // For backward compatibility $line->total_ht = $objp->total_ht; $line->total_tva = $objp->total_tva; $line->total_localtax1= $objp->total_localtax1; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index b4ddaf160e4..b2b3ebbd579 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -219,7 +219,9 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature { foreach($feature2 as $subfeature) { - if (empty($user->rights->$feature->$subfeature->creer) && empty($user->rights->$feature->$subfeature->write)) $createok=0; + if (empty($user->rights->$feature->$subfeature->creer) + && empty($user->rights->$feature->$subfeature->write) + && empty($user->rights->$feature->$subfeature->create)) $createok=0; else { $createok=1; break; } // For bypass the second test if the first is ok } } diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 769f635bc4c..9b6ed424c46 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -646,8 +646,8 @@ Permission1002=Crear/modificar stocks Permission1003=Eliminar stocks Permission1004=Consultar movimientos de stock Permission1005=Crear/modificar movimientos de stock -Permission1101=Consultar ordenes de envío -Permission1102=Crear/modificar ordenes de envío +Permission1101=Consultar órdenes de envío +Permission1102=Crear/modificar órdenes de envío Permission1104=Validar orden de envío Permission1109=Eliminar orden de envío Permission1181=Consultar proveedores diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index 75156b22660..736577af6d3 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -9,7 +9,7 @@ StandingOrderToProcess=A procesar StandingOrderProcessed=Procesados Withdrawals=Reintegros Withdrawal=Reintegro -WithdrawalsReceipts=Ordenes domiciliadas +WithdrawalsReceipts=Órdenes domiciliadas WithdrawalReceipt=Orden domiciliación WithdrawalReceiptShort=Orden LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index 8fd68e2b954..3fed5d5152c 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -157,7 +157,7 @@ else $form = new Form($db); if (empty($mode) || $mode == 1) { - $arrayresult=$form->select_produits_do("",$htmlname,$type,"",$pricelevel,$searchkey,$status,2,$outjson); + $arrayresult=$form->select_produits_do("",$htmlname,$type,"",$price_level,$searchkey,$status,2,$outjson); } elseif ($mode == 2) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 22c6aa0e6c1..b9ad2991738 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -431,7 +431,7 @@ class Product extends CommonObject $this->ref = dol_string_nospecial(trim($this->ref)); $this->libelle = trim($this->libelle); $this->description = trim($this->description); - $this->note = trim($this->note); + $this->note = (isset($this->note)? trim($this->note):"null"); $this->weight = price2num($this->weight); $this->weight_units = trim($this->weight_units); $this->length = price2num($this->length); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 9e5f8da0e3b..0f6f7b55313 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -223,6 +223,7 @@ foreach ($listofreferent as $key => $value) $date=$element->date; if (empty($date)) $date=$element->datep; if (empty($date)) $date=$element->date_contrat; + if (empty($date)) $date=$element->datev; //Fiche inter print ''; // Third party
"; - print ' '; + print $ligne->LibStatut($obj->statut,2).' '; print ''; print substr('000000'.$obj->rowid, -6)."'.dol_print_date($date,'day').'