';
print '| ' . $langs->trans('NotePublic') . ' | ';
print '';
- $note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc)?$objectsrc->note_public:null));
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
print $doleditor->Create(1);
@@ -2472,7 +2479,6 @@ if ($action == 'create')
print ' |
';
print '| ' . $langs->trans('NotePrivate') . ' | ';
print '';
- $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 '
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 12195e5e05e..cd14736632d 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1565,7 +1565,7 @@ class BonPrelevement extends CommonObject
$XML_DEBITOR ='';
$XML_DEBITOR .=' '.$CrLf;
$XML_DEBITOR .=' '.$CrLf;
- $XML_DEBITOR .=' '.('AS-'.$row_facnumber.'-'.$Rowing).''.$CrLf;
+ $XML_DEBITOR .=' '.('AS-'.dol_trunc($row_facnumber,20).'-'.$Rowing).''.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
$XML_DEBITOR .=' '.$CrLf;
$XML_DEBITOR .=' '.round($row_somme, 2).''.$CrLf;
$XML_DEBITOR .=' '.$CrLf;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 910afcdfd96..cc51df1f90f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3279,7 +3279,7 @@ class Form
* @param int $width Force width of bow
* @return string HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
*/
- function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500)
+ function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=200, $width=500)
{
global $langs,$conf;
global $useglobalvars;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 4c5b654a76f..bc79a403002 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -99,7 +99,7 @@ $coldisplay=-1; // We remove first td
$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
$doleditor->Create();
} else {
- print '';
+ print '';
}
?>
|
@@ -257,8 +257,14 @@ $coldisplay=-1; // We remove first td
jQuery(document).ready(function()
{
- jQuery("#price_ht").keyup(function() { jQuery("#price_ttc").val(''); });
- jQuery("#price_ttc").keyup(function() { jQuery("#price_ht").val(''); });
+ jQuery("#price_ht").keyup(function(event) {
+ // console.log(event.which); // discard event tag and arrows
+ if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#price_ht").val() != '') jQuery("#price_ttc").val('');
+ });
+ jQuery("#price_ttc").keyup(function(event) {
+ // console.log(event.which); // discard event tag and arrows
+ if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#price_ttc").val() != '') jQuery("#price_ht").val('');
+ });
margin->enabled))
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 195dff26029..cee2b806d5c 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -470,7 +470,6 @@ if ($object->id > 0)
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
$sql.= " WHERE p.fk_soc =".$object->id;
$sql.= " AND p.entity =".$conf->entity;
- $sql.= " ORDER BY p.date_commande DESC";
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a69880f7fa5..cedf40678d2 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -144,7 +144,7 @@ class FormProduct
* @param string $morecss Add more css classes
* @return string HTML select
*/
- function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='', $showstock=0, $forcecombo=0, $events=array(), $morecss='')
+ function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='', $showstock=0, $forcecombo=0, $events=array(), $morecss='minwidth200')
{
global $conf,$langs,$user;
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 0c509240684..aa5044da610 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -386,7 +386,7 @@ if ($usertoprocess->id == $user->id) print ''.$langs->trans("T
else print ' | '.$langs->trans("TimeSpentByUser").' | ';
print ''.$langs->trans("HourStart").' | ';
print ''.$langs->trans("Duration").' | ';
-print ''.$langs->trans("Note").' | ';
+print ''.$langs->trans("Note").' | ';
print "
\n";
// By default, we can edit only tasks we are assigned to