'."\n";
@@ -1094,7 +1094,14 @@ if ($resql)
if (! empty($arrayfields['s.nom']['checked']))
{
print '';
- print $thirdpartystatic->getNomUrl(1, 'customer');
+ if ($contextpage == 'poslist')
+ {
+ print $thirdpartystatic->name;
+ }
+ else
+ {
+ print $thirdpartystatic->getNomUrl(1, 'customer');
+ }
print ' ';
if (! $i) $totalarray['nbfield']++;
}
@@ -1261,7 +1268,7 @@ if ($resql)
// Action column
print '';
- if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ if (($massactionbutton || $massaction) && $contextpage != 'poslist') // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
if (in_array($obj->id, $arrayofselected)) $selected=1;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 30c31109224..ce36be991d2 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -539,7 +539,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
$sql.= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
- $sql.= ' WHERE f.entity IN ('.getEntity('invoice', $conf->entity).')';
+ $sql.= ' WHERE f.entity IN ('.getEntity('facture').')';
$sql.= ' AND (f.fk_soc = '.$facture->socid;
// Can pay invoices of all child of parent company
if(!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0318efb7e1a..9e68e6e79a3 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -710,37 +710,37 @@ if ($id > 0)
// Reopen
if ($object->paye && $user->rights->tax->charges->creer)
{
- print "id&action=reopen\">".$langs->trans("ReOpen")." ";
+ print "";
}
// Edit
if ($object->paye == 0 && $user->rights->tax->charges->creer)
{
- print "id&action=edit\">".$langs->trans("Modify")." ";
+ print "";
}
// Emit payment
if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer)
{
- print "id&action=create\">".$langs->trans("DoPayment")." ";
+ print "";
}
// Classify 'paid'
if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
{
- print "id&action=paid\">".$langs->trans("ClassifyPaid")." ";
+ print "";
}
// Clone
if ($user->rights->tax->charges->creer)
{
- print "id&action=clone\">".$langs->trans("ToClone")." ";
+ print "";
}
// Delete
if ($user->rights->tax->charges->supprimer)
{
- print "id&action=delete\">".$langs->trans("Delete")." ";
+ print "";
}
print "";
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 4fd157de9e6..c3914ae79db 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -317,7 +317,7 @@ class ChargeSociales extends CommonObject
$sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
$sql.= ", periode='".$this->db->idate($this->periode)."'";
$sql.= ", amount='".price2num($this->amount, 'MT')."'";
- $sql.= ", fk_projet=".($this->fk_project > 0 ? $this->fk_project : null);
+ $sql.= ", fk_projet=".($this->fk_project>0?$this->db->escape($this->fk_project):"NULL");
$sql.= ", fk_user_modif=".$user->id;
$sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index be738b374cf..759ed75df5e 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -385,16 +385,16 @@ if ($id)
{
if (! empty($user->rights->tax->charges->supprimer))
{
- print ''.$langs->trans("Delete").' ';
+ print '';
}
else
{
- print ''.$langs->trans("Delete").' ';
+ print '';
}
}
else
{
- print ''.$langs->trans("Delete").' ';
+ print '';
}
print "";
}
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fa26c5ed30b..b0db8b0affb 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -165,8 +165,8 @@ $arrayfields=array(
'p.fax'=>array('label'=>"Fax", 'checked'=>0),
'p.email'=>array('label'=>"EMail", 'checked'=>1),
'p.no_email'=>array('label'=>"No_Email", 'checked'=>0, 'enabled'=>(! empty($conf->mailing->enabled))),
- 'p.jabberid'=>array('label'=>"Jabber", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.skype'=>array('label'=>"Skype", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
+ 'p.jabberid'=>array('label'=>"Jabber", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.twitter'=>array('label'=>"Twitter", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.facebook'=>array('label'=>"Facebook", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.linkedin'=>array('label'=>"LinkedIn", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
@@ -427,7 +427,7 @@ if ($search_societe != '') $param.='&search_societe='.urlencode($search_soci
if ($search_zip != '') $param.='&search_zip='.urlencode($search_zip);
if ($search_town != '') $param.='&search_town='.urlencode($search_town);
if ($search_country != '') $param.= "&search_country=".urlencode($search_country);
-if ($search_job != '') $param.='&search_job='.urlencode($search_job);
+if ($search_poste != '') $param.='&search_poste='.urlencode($search_poste);
if ($search_phone_pro != '') $param.='&search_phone_pro='.urlencode($search_phone_pro);
if ($search_phone_perso != '') $param.='&search_phone_perso='.urlencode($search_phone_perso);
if ($search_phone_mobile != '') $param.='&search_phone_mobile='.urlencode($search_phone_mobile);
@@ -629,6 +629,12 @@ if (! empty($arrayfields['p.skype']['checked']))
print ' ';
}
+if (! empty($arrayfields['p.jabberid']['checked']))
+{
+ print '';
+ print ' ';
+}
if (! empty($arrayfields['p.twitter']['checked']))
{
print '';
@@ -720,6 +726,7 @@ if (! empty($arrayfields['p.fax']['checked'])) print_liste_field
if (! empty($arrayfields['p.email']['checked'])) print_liste_field_titre($arrayfields['p.email']['label'], $_SERVER["PHP_SELF"], "p.email", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.no_email']['checked'])) print_liste_field_titre($arrayfields['p.no_email']['label'], $_SERVER["PHP_SELF"], "p.no_email", $begin, $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['p.skype']['checked'])) print_liste_field_titre($arrayfields['p.skype']['label'], $_SERVER["PHP_SELF"], "p.skype", $begin, $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['p.jabberid']['checked'])) print_liste_field_titre($arrayfields['p.jabberid']['label'], $_SERVER["PHP_SELF"], "p.jabberid", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.twitter']['checked'])) print_liste_field_titre($arrayfields['p.twitter']['label'], $_SERVER["PHP_SELF"], "p.twitter", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.facebook']['checked'])) print_liste_field_titre($arrayfields['p.facebook']['label'], $_SERVER["PHP_SELF"], "p.facebook", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.linkedin']['checked'])) print_liste_field_titre($arrayfields['p.linkedin']['label'], $_SERVER["PHP_SELF"], "p.linkedin", $begin, $param, '', $sortfield, $sortorder);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 9dd49ea8864..86ef739d63e 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -195,6 +195,29 @@ abstract class CommonInvoice extends CommonObject
}
}
+ /**
+ * Return amount (with tax) of all converted amount for this credit note
+ *
+ * @param int $multicurrency Return multicurrency_amount instead of amount
+ * @return int <0 if KO, Sum of credit notes and deposits amount otherwise
+ */
+ function getSumFromThisCreditNotesNotUsed($multicurrency=0)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+ $discountstatic=new DiscountAbsolute($this->db);
+ $result=$discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
+ if ($result >= 0)
+ {
+ return $result;
+ }
+ else
+ {
+ $this->error=$discountstatic->error;
+ return -1;
+ }
+ }
+
/**
* Renvoie tableau des ids de facture avoir issus de la facture
*
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 678cfe446a0..cb2ad44b90c 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -629,6 +629,49 @@ class DiscountAbsolute
return -1;
}
}
+ /**
+ * Return amount (with tax) of all converted amount for this credit note
+ *
+ * @param CommonInvoice $invoice Object invoice
+ * @param int $multicurrency Return multicurrency_amount instead of amount
+ * @return int <0 if KO, Sum of credit notes and deposits amount otherwise
+ */
+ function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency=0)
+ {
+ dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+ if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+ {
+ $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+ $sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
+ }
+ else if ($invoice->element == 'invoice_supplier')
+ {
+ $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+ $sql.= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
+ }
+ else
+ {
+ $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+ dol_print_error($this->error);
+ return -1;
+ }
+
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $obj = $this->db->fetch_object($resql);
+ if ($multicurrency) return $obj->multicurrency_amount;
+ else return $obj->amount;
+ }
+ else
+ {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
/**
* Return clickable ref of object (with picto or not)
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index cf2c2418092..a32223105b9 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/core/modules/oauth/stripe_oauthcallback.php
+ * \file htdocs/core/modules/oauth/stripelive_oauthcallback.php
* \ingroup oauth
* \brief Page to get oauth callback
*/
@@ -45,7 +45,7 @@ $backtourl = GETPOST('backtourl', 'alpha');
$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
//$currentUri->setQuery('');
-$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripe_oauthcallback.php');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php');
/**
@@ -65,7 +65,7 @@ $storage = new DoliStorage($db, $conf);
// Setup the credentials for the requests
$credentials = new Credentials(
- $conf->global->OAUTH_STRIPE_TEST_ID,
+ $conf->global->OAUTH_STRIPE_LIVE_ID,
$conf->global->STRIPE_LIVE_SECRET_KEY,
$currentUri->getAbsoluteUri()
);
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index eb7463749ae..55b532f231c 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -17,7 +17,7 @@
*/
/**
- * \file htdocs/core/modules/oauth/stripe_oauthcallback.php
+ * \file htdocs/core/modules/oauth/stripetest_oauthcallback.php
* \ingroup oauth
* \brief Page to get oauth callback
*/
@@ -45,7 +45,7 @@ $backtourl = GETPOST('backtourl', 'alpha');
$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
//$currentUri->setQuery('');
-$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripe_oauthcallback.php');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php');
/**
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 3830e2bc31a..14534b3472e 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -69,7 +69,7 @@ $userstatic=new User($db);
if ($permission) {
?>