From 1381373c95250e161ff569c6469490b544572b13 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 09:24:29 +0200 Subject: [PATCH 1/3] Fix : set emetteur to MYCOMPANY when payment is a customer --- htdocs/compta/paiement.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 4a8f93a52f6..232126d68e2 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -286,7 +286,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $(\'.fieldrequireddyn\').addClass(\'fieldrequired\'); if ($(\'#fieldchqemetteur\').val() == \'\') { - $(\'#fieldchqemetteur\').val(jQuery(\'#thirdpartylabel\').val()); + var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag(MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val(); + $(\'#fieldchqemetteur\').val(emetteur); } } else From dcdbdd42fbe52a1c9bb74ae814a66f3ce70cb7b6 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 09:25:19 +0200 Subject: [PATCH 2/3] Fix : action list couldn't be sorted by label, action type was kept in filter --- htdocs/comm/action/listactions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index b603792b957..7a5dbfdaff9 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -182,7 +182,7 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0) } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); -//print $sql; +print $sql; dol_syslog("comm/action/listactions.php sql=".$sql); $resql=$db->query($sql); @@ -238,7 +238,7 @@ if ($resql) $i = 0; print ''; print ''; - print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); //print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder); From 6c62d0cd283fffcb819346217046682b75faae80 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 18 Apr 2013 10:12:16 +0200 Subject: [PATCH 3/3] Print forgotten --- htdocs/comm/action/listactions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 7a5dbfdaff9..9e7a7a959bb 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -182,7 +182,7 @@ if ($filtera > 0 || $filtert > 0 || $filterd > 0) } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); -print $sql; +//print $sql; dol_syslog("comm/action/listactions.php sql=".$sql); $resql=$db->query($sql);