'.$langs->trans("PlaceCustomerAddressToIsoLocation").' ';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 8b17c860fd4..e627068b692 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -220,7 +220,7 @@ print load_fiche_titre($langs->trans("SupplierProposalSetup"), $linkback, 'title
$head = supplier_proposal_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'supplier_proposal');
+dol_fiche_head($head, 'general', $langs->trans("CommRequests"), -1, 'supplier_proposal');
/*
* Module numerotation
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 67f75c911aa..e17756391f1 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -70,6 +70,18 @@ else
}
print ''.$langs->trans("Syslog").' : ';
+$test=empty($conf->syslog->enabled);
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+else
+{
+ print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
+ //print ' '.$langs->trans("MoreInformation").' XDebug admin page ';
+}
+print ''.$langs->trans("DebugBar").' : ';
@@ -77,7 +89,7 @@ $test=empty($conf->debugbar->enabled);
if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
else
{
- print img_picto('', 'warning').' '.$langs->trans("DebugBarModuleActivated");
+ print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
//print ' '.$langs->trans("MoreInformation").' XDebug admin page ';
}
print 'Xcache admin page ';
}
$test=function_exists('eaccelerator_info');
if (! $foundcache && $test)
{
$foundcache++;
- print img_picto('', 'tick.png').' '.$langs->trans("EAcceleratorInstalled");
+ print img_picto('', 'tick.png').' '.$langs->trans("PHPModuleLoaded", "Eaccelerator");
}
$test=function_exists('opcache_get_status');
if (! $foundcache && $test)
{
$foundcache++;
- print img_picto('', 'tick.png').' '.$langs->trans("ZendOPCacheInstalled"); // Should be by default starting with PHP 5.5
+ print img_picto('', 'tick.png').' '.$langs->trans("PHPModuleLoaded", "ZendOPCache"); // Should be by default starting with PHP 5.5
//$tmp=opcache_get_status();
//var_dump($tmp);
}
@@ -144,6 +156,21 @@ if (! $foundcache && $test)
if (! $foundcache) print $langs->trans("NoOPCodeCacheFound");
print ''.$langs->trans("PreloadOPCode").' : ';
+ print ini_get('opcache.preload');
+}
+else
+{
+ print ''.$langs->trans("PreloadOPCode").' : ';
+ print $langs->trans("No");
+}
+print '';
- $langs->load("errors");
- print $langs->trans("ErrorModuleSetupNotComplete");
- print '
';
- $action='';
-}
-
-
-print '
';
-
-$head = array();
-
-if ($action == 'editcontent')
-{
- /*
- * Editing global variables not related to a specific theme
- */
-
- $csscontent = @file_get_contents($filecss);
-
- $contentforedit = '';
- /*$contentforedit.=''."\n";*/
- $contentforedit .= $objectpage->content;
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%');
- $doleditor->Create(0, '', false);
-}
print "
';
- if ($obj->fk_contact > 0)
+
+
+ $actionstatic->fetchResources();
+ if(!empty($actionstatic->socpeopleassigned))
+ {
+ $contactList = array();
+ foreach ($actionstatic->socpeopleassigned as $socpeopleId => $socpeopleassigned)
+ {
+ if(!isset($contactListCache[$socpeopleassigned['id']]))
+ {
+ // if no cache found we fetch it
+ $contact = new Contact($db);
+ if($contact->fetch($socpeopleassigned['id'])>0)
+ {
+ $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 28);
+ $contactList[] = $contact->getNomUrl(1, '', 28);
+ }
+ }
+ else{
+ // use cache
+ $contactList[] = $contactListCache[$socpeopleassigned['id']];
+ }
+ }
+ if(!empty($contactList)){
+ print implode(', ', $contactList);
+ }
+ }
+ elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
{
$contactstatic->id=$obj->fk_contact;
$contactstatic->email=$obj->email;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 721aba20de8..285ed03e7c3 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -694,7 +694,7 @@ if ($object->id > 0)
if ($num > 0)
{
print '';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastPropals", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllPropals").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastCustomerOrders", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllOrders").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastSendings", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllSendings").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastContracts", ($num<=$MAXLIST?"":$MAXLIST)).' ';
@@ -989,7 +989,7 @@ if ($object->id > 0)
if ($num > 0)
{
print '';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastInterventions", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllInterventions").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LatestCustomerTemplateInvoices", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllCustomerTemplateInvoices").' '.$num.' ';
- print '
';
+ print '';
print '';
print ''.$langs->trans("LastCustomersBills", ($num<=$MAXLIST?"":$MAXLIST)).' '.$langs->trans("AllBills").' '.$num.' ';
if (empty($obj->picto)) $obj->picto='generic';
- print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto);
+ print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle pictomodule"');
print ' ';
print $obj->getDesc();
print '
';
@@ -402,7 +402,8 @@ if ($object->fetch($id) >= 0)
}
// List of selected targets
- $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type, mc.error_text";
+ $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.tms,";
+ $sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id;
if ($search_lastname) $sql.= natural_search("mc.lastname", $search_lastname);
@@ -475,15 +476,15 @@ if ($object->fetch($id) >= 0)
print '';
// EMail
print '';
- print ' ';
// Name
print '';
- print ' ';
// Firstname
print '';
- print ' ';
// Other
print '';
@@ -494,10 +495,16 @@ if ($object->fetch($id) >= 0)
print ' ';
print ' ';
+ // Date last update
+ print '';
+ print ' ';
+ print ' ';
+
// Date sending
print '';
print ' ';
print ' ';
+
//Statut
print '';
print $formmailing->selectDestinariesStatus($search_dest_status, 'search_dest_status', 1);
@@ -515,14 +522,10 @@ if ($object->fetch($id) >= 0)
print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "mc.firstname", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("OtherInformations", $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Source", $_SERVER["PHP_SELF"], "", $param, "", 'align="center"', $sortfield, $sortorder);
+ // Date last update
+ print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "mc.tms", $param, "", 'align="center"', $sortfield, $sortorder);
// Date sending
- if ($object->statut < 2) {
- print_liste_field_titre('');
- }
- else
- {
- print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, '', 'align="center"', $sortfield, $sortorder);
- }
+ print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, '', 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "mc.statut", $param, '', 'class="right"', $sortfield, $sortorder);
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print ' ';
@@ -583,16 +586,25 @@ if ($object->fetch($id) >= 0)
}
print '';
+ // Date last update
+ print '';
+ print dol_print_date($obj->tms, 'dayhour');
+ print ' ';
+
// Status of recipient sending email (Warning != status of emailing)
if ($obj->statut == 0)
{
+ // Date sent
print ' ';
+
print ''.$langs->trans("MailingStatusNotSent");
print ' ';
}
else
{
+ // Date sent
print ''.$obj->date_envoi.' ';
+
print '';
print $object::libStatutDest($obj->statut, 2, $obj->error_text);
print ' ';
@@ -620,7 +632,7 @@ if ($object->fetch($id) >= 0)
{
if ($object->statut < 2)
{
- print '';
+ print ' ';
print $langs->trans("NoTargetYet");
print ' ';
print $langs->trans('OutstandingBill');
print ' ';
- print price($soc->get_OutstandingBill()) . ' / ';
+ $arrayoutstandingbills = $soc->getOutstandingBills();
+ print price($arrayoutstandingbills['opened']) . ' / ';
print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
print ' ';
print '
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2008 Raphael Bertrand
- * Copyright (C) 2010-2014 Juanjo Menent
+ * Copyright (C) 2010-2019 Juanjo Menent
* Copyright (C) 2010-2017 Philippe Grand
* Copyright (C) 2012-2014 Christophe Battarel
* Copyright (C) 2012 Cedric Salvador
@@ -530,11 +530,11 @@ class Propal extends CommonObject
$pu_ht_devise = $tabprice[19];
// Rang to use
- $rangtouse = $rang;
- if ($rangtouse == -1)
+ $ranktouse = $rang;
+ if ($ranktouse == -1)
{
$rangmax = $this->line_max($fk_parent_line);
- $rangtouse = $rangmax + 1;
+ $ranktouse = $rangmax + 1;
}
// TODO A virer
@@ -568,7 +568,7 @@ class Propal extends CommonObject
$this->line->fk_remise_except=$fk_remise_except;
$this->line->remise_percent=$remise_percent;
$this->line->subprice=$pu_ht;
- $this->line->rang=$rangtouse;
+ $this->line->rang=$ranktouse;
$this->line->info_bits=$info_bits;
$this->line->total_ht=$total_ht;
$this->line->total_tva=$total_tva;
@@ -890,7 +890,6 @@ class Propal extends CommonObject
$now=dol_now();
// Clean parameters
- if (empty($this->entity)) $this->entity = $conf->entity;
if (empty($this->date)) $this->date=$this->datep;
$this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
if (empty($this->availability_id)) $this->availability_id=0;
@@ -1000,7 +999,7 @@ class Propal extends CommonObject
$sql.= ", ".($this->fk_project?$this->fk_project:"null");
$sql.= ", ".(int) $this->fk_incoterms;
$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
- $sql.= ", ".$this->entity;
+ $sql.= ", ".setEntity($this);
$sql.= ", ".(int) $this->fk_multicurrency;
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".(double) $this->multicurrency_tx;
@@ -1056,14 +1055,6 @@ class Propal extends CommonObject
}
}
- // Add linked object (deprecated, use ->linkedObjectsIds instead)
- if (! $error && $this->origin && $this->origin_id)
- {
- dol_syslog('Deprecated use of linked object, use ->linkedObjectsIds instead', LOG_WARNING);
- $ret = $this->add_object_linked();
- if (! $ret) dol_print_error($this->db);
- }
-
/*
* Insertion du detail des produits dans la base
* Insert products detail in database
@@ -1091,7 +1082,7 @@ class Propal extends CommonObject
$vatrate = $line->tva_tx;
if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
- $result = $this->addline(
+ $result = $this->addline(
$line->desc,
$line->subprice,
$line->qty,
@@ -1138,7 +1129,7 @@ class Propal extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
$sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
- $sql.= " AND entity = ".$conf->entity;
+ $sql.= " AND entity = ".setEntity($this);
$result=$this->db->query($sql);
}
@@ -1330,9 +1321,9 @@ class Propal extends CommonObject
// Hook of thirdparty module
if (is_object($hookmanager))
{
- $parameters=array('objFrom'=>$this,'clonedObj'=>$clonedObj);
+ $parameters=array('objFrom'=>$this,'clonedObj'=>$object);
$action='';
- $reshook=$hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
+ $reshook=$hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
}
}
@@ -1749,10 +1740,10 @@ class Propal extends CommonObject
*/
public function valid($user, $notrigger = 0)
{
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
global $conf;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
$error=0;
// Protection
@@ -1818,14 +1809,18 @@ class Propal extends CommonObject
// Rename directory if dir was a temporary ref
if (preg_match('/^[\(]?PROV/i', $this->ref))
{
- // Rename of propal directory ($this->ref = old ref, $num = new ref)
- // to not lose the linked files
+ // Now we rename also files into index
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'propale/".$this->db->escape($this->newref)."'";
+ $sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'propale/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+
+ // We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->propal->multidir_output[$this->entity].'/'.$oldref;
$dirdest = $conf->propal->multidir_output[$this->entity].'/'.$newref;
-
- if (file_exists($dirsource))
+ if (! $error && file_exists($dirsource))
{
dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
if (@rename($dirsource, $dirdest))
@@ -3273,21 +3268,24 @@ class Propal extends CommonObject
$delay_warning = 0;
$statut = 0;
- $label = '';
+ $label = $labelShort = '';
if ($mode == 'opened') {
$delay_warning=$conf->propal->cloture->warning_delay;
$statut = self::STATUS_VALIDATED;
$label = $langs->trans("PropalsToClose");
+ $labelShort = $langs->trans("ToAcceptRefuse");
}
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
+ $labelShort = $langs->trans("ToBill");
}
$response = new WorkboardResponse();
$response->warning_delay = $delay_warning/60/60/24;
$response->label = $label;
+ $response->labelShort = $labelShort;
$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");
@@ -3512,7 +3510,7 @@ class Propal extends CommonObject
else
{
$langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
return "";
}
}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 241f22cfe38..2964ff98690 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -168,6 +168,7 @@ $arrayfields=array(
'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+ 'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
);
// Extra fields
@@ -269,10 +270,10 @@ $sql.= " typent.code as typent_code,";
$sql.= " ava.rowid as availability,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
$sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
-$sql.= ' p.datec as date_creation, p.tms as date_update,';
+$sql.= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
$sql.= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
$sql.= ' u.login';
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user,";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields
foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -688,6 +689,12 @@ if ($resql)
print '';
print ' ';
}
+ // Date cloture
+ if (! empty($arrayfields['p.date_cloture']['checked']))
+ {
+ print '';
+ print ' ';
+ }
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
@@ -735,6 +742,7 @@ if ($resql)
print $hookmanager->resPrint;
if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.date_cloture']['checked'])) print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print ''."\n";
@@ -1054,7 +1062,7 @@ if ($resql)
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
@@ -1073,6 +1081,14 @@ if ($resql)
print '';
if (! $i) $totalarray['nbfield']++;
}
+ // Date cloture
+ if (! empty($arrayfields['p.date_cloture']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 61d79e4abbb..910772d87ca 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -43,7 +43,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
// Load translation files required by the page
$langs->load("propal");
-$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
$total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 7362f30e5a8..bc728067b5f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -96,9 +96,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('ordercard','globalcard'));
-$permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->commande->creer; // Used by the include of actions_dellink.inc.php
-$permissionedit = $user->rights->commande->creer; // Used by the include of actions_lineupdown.inc.php
+$usercanread = $user->rights->commande->lire;
+$usercancreate = $user->rights->commande->creer;
+$usercanclose = $user->rights->commande->cloturer;
+$usercandelete = $user->rights->commande->supprimer;
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)));
+$usercancancel = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send);
+
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissionedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
/*
@@ -129,7 +137,7 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
// Action clone object
- if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->creer)
+ if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
{
if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
{
@@ -159,7 +167,7 @@ if (empty($reshook))
}
// Reopen a closed order
- elseif ($action == 'reopen' && $user->rights->commande->creer)
+ elseif ($action == 'reopen' && $usercancreate)
{
if ($object->statut == Commande::STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED)
{
@@ -176,7 +184,7 @@ if (empty($reshook))
}
// Remove order
- elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->commande->supprimer)
+ elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
{
$result = $object->delete($user);
if ($result > 0)
@@ -191,7 +199,7 @@ if (empty($reshook))
}
// Remove a product line
- elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->commande->creer)
+ elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
{
$result = $object->deleteline($user, $lineid);
if ($result > 0)
@@ -222,16 +230,17 @@ if (empty($reshook))
}
// Link to a project
- elseif ($action == 'classin' && $user->rights->commande->creer)
+ elseif ($action == 'classin' && $usercancreate)
{
$object->setProject(GETPOST('projectid', 'int'));
}
// Add order
- elseif ($action == 'add' && $user->rights->commande->creer)
+ elseif ($action == 'add' && $usercancreate)
{
$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
+ $selectedLines = GETPOST('toselect', 'array');
if ($datecommande == '') {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@@ -338,6 +347,8 @@ if (empty($reshook))
for($i = 0; $i < $num; $i ++)
{
+ if(!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+
$label = (! empty($lines[$i]->label) ? $lines[$i]->label : '');
$desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : '');
$product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
@@ -481,7 +492,7 @@ if (empty($reshook))
}
}
- elseif ($action == 'classifybilled' && $user->rights->commande->creer)
+ elseif ($action == 'classifybilled' && $usercancreate)
{
$ret=$object->classifyBilled($user);
@@ -489,7 +500,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
- elseif ($action == 'classifyunbilled' && $user->rights->commande->creer)
+ elseif ($action == 'classifyunbilled' && $usercancreate)
{
$ret=$object->classifyUnBilled();
if ($ret < 0) {
@@ -498,7 +509,7 @@ if (empty($reshook))
}
// Positionne ref commande client
- elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+ elseif ($action == 'setref_client' && $usercancreate) {
$result = $object->set_ref_client($user, GETPOST('ref_client'));
if ($result < 0)
{
@@ -506,7 +517,7 @@ if (empty($reshook))
}
}
- elseif ($action == 'setremise' && $user->rights->commande->creer) {
+ elseif ($action == 'setremise' && $usercancreate) {
$result = $object->set_remise($user, GETPOST('remise'));
if ($result < 0)
{
@@ -514,7 +525,7 @@ if (empty($reshook))
}
}
- elseif ($action == 'setabsolutediscount' && $user->rights->commande->creer) {
+ elseif ($action == 'setabsolutediscount' && $usercancreate) {
if (GETPOST('remise_id')) {
if ($object->id > 0) {
$object->insert_discount(GETPOST('remise_id'));
@@ -524,7 +535,7 @@ if (empty($reshook))
}
}
- elseif ($action == 'setdate' && $user->rights->commande->creer) {
+ elseif ($action == 'setdate' && $usercancreate) {
// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
@@ -534,7 +545,7 @@ if (empty($reshook))
}
}
- elseif ($action == 'setdate_livraison' && $user->rights->commande->creer) {
+ elseif ($action == 'setdate_livraison' && $usercancreate) {
// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
@@ -544,35 +555,35 @@ if (empty($reshook))
}
}
- elseif ($action == 'setmode' && $user->rights->commande->creer) {
+ elseif ($action == 'setmode' && $usercancreate) {
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
// Multicurrency Code
- elseif ($action == 'setmulticurrencycode' && $user->rights->commande->creer) {
+ elseif ($action == 'setmulticurrencycode' && $usercancreate) {
$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
}
// Multicurrency rate
- elseif ($action == 'setmulticurrencyrate' && $user->rights->commande->creer) {
+ elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
}
- elseif ($action == 'setavailability' && $user->rights->commande->creer) {
+ elseif ($action == 'setavailability' && $usercancreate) {
$result = $object->availability(GETPOST('availability_id'));
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
- elseif ($action == 'setdemandreason' && $user->rights->commande->creer) {
+ elseif ($action == 'setdemandreason' && $usercancreate) {
$result = $object->demand_reason(GETPOST('demand_reason_id'));
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
- elseif ($action == 'setconditions' && $user->rights->commande->creer) {
+ elseif ($action == 'setconditions' && $usercancreate) {
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
if ($result < 0) {
dol_print_error($db, $object->error);
@@ -604,7 +615,7 @@ if (empty($reshook))
}
// bank account
- elseif ($action == 'setbankaccount' && $user->rights->commande->creer) {
+ elseif ($action == 'setbankaccount' && $usercancreate) {
$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
@@ -612,7 +623,7 @@ if (empty($reshook))
}
// shipping method
- elseif ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+ elseif ($action == 'setshippingmethod' && $usercancreate) {
$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
@@ -620,23 +631,23 @@ if (empty($reshook))
}
// warehouse
- elseif ($action == 'setwarehouse' && $user->rights->commande->creer) {
+ elseif ($action == 'setwarehouse' && $usercancreate) {
$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
- elseif ($action == 'setremisepercent' && $user->rights->commande->creer) {
+ elseif ($action == 'setremisepercent' && $usercancreate) {
$result = $object->set_remise($user, GETPOST('remise_percent'));
}
- elseif ($action == 'setremiseabsolue' && $user->rights->commande->creer) {
+ elseif ($action == 'setremiseabsolue' && $usercancreate) {
$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
}
// Add a new line
- elseif ($action == 'addline' && $user->rights->commande->creer)
+ elseif ($action == 'addline' && $usercancreate)
{
$langs->load('errors');
$error = 0;
@@ -999,7 +1010,7 @@ if (empty($reshook))
/*
* Update a line
*/
- elseif ($action == 'updateline' && $user->rights->commande->creer && GETPOST('save'))
+ elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
{
// Clean parameters
$date_start='';
@@ -1133,15 +1144,12 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
- } elseif ($action == 'updateline' && $user->rights->commande->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+ } elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
exit();
}
- elseif ($action == 'confirm_validate' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
- )
+ elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
{
$idwarehouse = GETPOST('idwarehouse');
@@ -1195,7 +1203,7 @@ if (empty($reshook))
}
// Go back to draft status
- elseif ($action == 'confirm_modif' && $user->rights->commande->creer) {
+ elseif ($action == 'confirm_modif' && $usercancreate) {
$idwarehouse = GETPOST('idwarehouse');
$qualified_for_stock_change=0;
@@ -1243,17 +1251,14 @@ if (empty($reshook))
}
}
- elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer) {
+ elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
$result = $object->cloture($user);
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
- elseif ($action == 'confirm_cancel' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
- )
+ elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
{
$idwarehouse = GETPOST('idwarehouse');
@@ -1310,7 +1315,7 @@ if (empty($reshook))
if ($error) $action = 'edit_extras';
}
- if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+ if ($action == 'set_thirdparty' && $usercancreate)
{
$object->fetch($id);
$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
@@ -1321,7 +1326,7 @@ if (empty($reshook))
// add lines from objectlinked
if($action == 'import_lines_from_object'
- && $user->rights->commande->creer
+ && $usercancreate
&& $object->statut == Commande::STATUS_DRAFT
)
{
@@ -1405,8 +1410,8 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
// Actions to build doc
- $upload_dir = $conf->commande->dir_output;
- $permissioncreate = $user->rights->commande->creer;
+ $upload_dir = $conf->commande->multidir_output[$object->entity];
+ $permissioncreate = $usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
// Actions to send emails
@@ -1417,7 +1422,7 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
- if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer)
+ if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
{
if ($action == 'addcontact')
{
@@ -1478,7 +1483,7 @@ $formmargin = new FormMargin($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
// Mode creation
-if ($action == 'create' && $user->rights->commande->creer)
+if ($action == 'create' && $usercancreate)
{
print load_fiche_titre($langs->trans('CreateOrder'), '', 'title_commercial.png');
@@ -1519,11 +1524,11 @@ if ($action == 'create' && $user->rights->commande->creer)
if ($element == 'order' || $element == 'commande') {
$element = $subelement = 'commande';
}
- if ($element == 'propal') {
+ elseif ($element == 'propal') {
$element = 'comm/propal';
$subelement = 'propal';
}
- if ($element == 'contract') {
+ elseif ($element == 'contract') {
$element = $subelement = 'contrat';
}
@@ -1756,6 +1761,15 @@ if ($action == 'create' && $user->rights->commande->creer)
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
print $hookmanager->resPrint;
if (empty($reshook)) {
+ if (! empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER)) {
+ // copy from thirdparty
+ $tpExtrafields = new Extrafields($db);
+ $tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
+ if ($soc->fetch_optionals() > 0) {
+ $object->array_options = array_merge($object->array_options, $soc->array_options);
+ }
+ };
+
print $object->showOptionals($extrafields, 'edit');
}
@@ -1870,8 +1884,6 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
- $objectsrc->printOriginLinesList();
+ $objectsrc->printOriginLinesList('', $selectedLines);
print '
';
}
+
+ print '';
} else {
// Mode view
$now = dol_now();
@@ -2069,8 +2083,8 @@ if ($action == 'create' && $user->rights->commande->creer)
$morehtmlref='';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (
'.$langs->trans("OtherOrders").' )';
@@ -2079,7 +2093,7 @@ if ($action == 'create' && $user->rights->commande->creer)
{
$langs->load("projects");
$morehtmlref.='
'.$langs->trans('Project') . ' ';
- if ($user->rights->commande->creer)
+ if ($usercancreate)
{
if ($action != 'classify')
$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
@@ -2116,7 +2130,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '
';
print '
';
- print '
';
+ print '';
if ($soc->outstanding_limit)
{
@@ -2124,7 +2138,8 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print $langs->trans('OutstandingBill');
print ' ';
- print price($soc->get_OutstandingBill()) . ' / ';
+ $arrayoutstandingbills = $soc->getOutstandingBills();
+ print price($arrayoutstandingbills['opened']) . ' / ';
print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
print ' ';
print '';
- $editenable = $user->rights->commande->creer && $object->statut == Commande::STATUS_DRAFT;
+ $editenable = $usercancreate && $object->statut == Commande::STATUS_DRAFT;
print $form->editfieldkey("Date", 'date', '', $object, $editenable);
print ' ';
if ($action == 'editdate') {
@@ -2180,7 +2195,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Delivery date planed
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("DateDeliveryPlanned", 'date_livraison', '', $object, $editenable);
print ' ';
if ($action == 'editdate_livraison') {
@@ -2202,7 +2217,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Shipping Method
if (! empty($conf->expedition->enabled)) {
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable);
print ' ';
if ($action == 'editshippingmethod') {
@@ -2220,7 +2235,7 @@ if ($action == 'create' && $user->rights->commande->creer)
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
$formproduct=new FormProduct($db);
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $editenable);
print ' ';
if ($action == 'editwarehouse') {
@@ -2234,7 +2249,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Terms of payment
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("PaymentConditionsShort", 'conditions', '', $object, $editenable);
print ' ';
if ($action == 'editconditions') {
@@ -2248,7 +2263,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Mode of payment
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("PaymentMode", 'mode', '', $object, $editenable);
print ' ';
if ($action == 'editmode') {
@@ -2264,7 +2279,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Multicurrency code
print ' ';
print '';
- $editenable = $user->rights->commande->creer && $object->statut == Commande::STATUS_DRAFT;
+ $editenable = $usercancreate && $object->statut == Commande::STATUS_DRAFT;
print $form->editfieldkey("Currency", 'multicurrencycode', '', $object, $editenable);
print ' ';
if ($action == 'editmulticurrencycode') {
@@ -2277,7 +2292,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Multicurrency rate
print ' ';
print '';
- $editenable = $user->rights->commande->creer && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == Commande::STATUS_DRAFT;
+ $editenable = $usercancreate && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == Commande::STATUS_DRAFT;
print $form->editfieldkey("CurrencyRate", 'multicurrencyrate', '', $object, $editenable);
print ' ';
if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -2298,7 +2313,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Delivery delay
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("AvailabilityPeriod", 'availability', '', $object, $editenable);
print ' ';
if ($action == 'editavailability') {
@@ -2310,7 +2325,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Source reason (why we have an ordrer)
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("Channel", 'demandreason', '', $object, $editenable);
print ' ';
if ($action == 'editdemandreason') {
@@ -2323,7 +2338,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// TODO Order mode (how we receive order). Not yet implemented
/*
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("SourceMode", 'inputmode', '', $object, $editenable);
print ' ';
if ($action == 'editinputmode') {
@@ -2355,7 +2370,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Incoterms
if (!empty($conf->incoterm->enabled)) {
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("IncotermLabel", 'incoterm', '', $object, $editenable);
print ' ';
print '';
@@ -2373,7 +2388,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Bank Account
if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) {
print ' ';
- $editenable = $user->rights->commande->creer;
+ $editenable = $usercancreate;
print $form->editfieldkey("BankAccount", 'bankaccount', '', $object, $editenable);
print ' ';
if ($action == 'editbankaccount') {
@@ -2454,7 +2469,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '';
- print '';
+ print ''; // Close fichecenter
print '
';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
print '
';
@@ -323,7 +323,7 @@ else dol_print_error($db);
*/
if (! empty($conf->commande->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
$sql.= ", s.client";
$sql.= ", s.code_client";
$sql.= ", s.canvas";
@@ -377,7 +377,7 @@ if (! empty($conf->commande->enabled))
print '';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
print '
';
@@ -405,7 +405,7 @@ if (! empty($conf->commande->enabled))
*/
if (! empty($conf->commande->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
$sql.= ", s.client";
$sql.= ", s.code_client";
$sql.= ", s.canvas";
@@ -459,7 +459,7 @@ if (! empty($conf->commande->enabled))
print '
';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
print '
';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index f64aadf0e53..66a3862bd2c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -91,7 +91,7 @@ $id = (GETPOST('orderid')?GETPOST('orderid', 'int'):GETPOST('id', 'int'));
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'commande', $id, '');
-$diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction=$conf->commande->multidir_output[$conf->entity] . '/temp/massgeneration/'.$user->id;
// Load variable for pagination
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
@@ -143,6 +143,7 @@ $arrayfields=array(
'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+ 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
);
@@ -217,7 +218,7 @@ if (empty($reshook))
$objectlabel='Orders';
$permtoread = $user->rights->commande->lire;
$permtodelete = $user->rights->commande->supprimer;
- $uploaddir = $conf->commande->dir_output;
+ $uploaddir = $conf->commande->multidir_output[$conf->entity];
$trigger_name='ORDER_SENTBYMAIL';
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
@@ -247,7 +248,7 @@ $sql.= " typent.code as typent_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
$sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
-$sql.= ' c.date_creation as date_creation, c.tms as date_update,';
+$sql.= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
$sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
// Add fields from extrafields
@@ -693,6 +694,12 @@ if ($resql)
print '';
print ' ';
}
+ // Date cloture
+ if (! empty($arrayfields['c.date_cloture']['checked']))
+ {
+ print '';
+ print ' ';
+ }
// Status
if (! empty($arrayfields['c.fk_statut']['checked']))
{
@@ -748,7 +755,8 @@ 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, '', $sortfield, $sortorder, 'center nowrap ');
if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
- if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['c.date_cloture']['checked'])) print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
if (! empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
print ' '."\n";
@@ -926,7 +934,7 @@ if ($resql)
print '';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->commande->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
print ' ';
@@ -1073,7 +1081,7 @@ if ($resql)
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
@@ -1092,6 +1100,14 @@ if ($resql)
print '';
if (! $i) $totalarray['nbfield']++;
}
+ // Date cloture
+ if (! empty($arrayfields['c.date_cloture']['checked']))
+ {
+ print '';
+ print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+ print ' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Status
if (! empty($arrayfields['c.fk_statut']['checked']))
{
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 33acc2b4969..fa983e46f8e 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -548,7 +548,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
';
$filename=dol_sanitizeFileName($objp->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+ $filedir=$conf->commande->multidir_output[$objp->entity] . '/' . dol_sanitizeFileName($objp->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid;
print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
print '
';
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 1f8b440749f..74a2243d633 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -39,7 +39,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
// Load translation files required by the page
$langs->load("orders");
-$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
$total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 9069045c8b3..ee6d0d71fc0 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -26,13 +26,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-$langs->loadLangs(array("accountancy", "bills", "companies", "salaries"));
+$langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta"));
$date_start =GETPOST('date_start', 'alpha');
$date_startDay= GETPOST('date_startday', 'int');
@@ -503,9 +503,9 @@ if (!empty($date_start) && !empty($date_stop))
print ''.price($totalET).' ';
- print ''.price($totalIT).' ';
- print ''.price($totalVAT).' ';
+ print ''.price(price2num($totalET, 'MT')).' ';
+ print ''.price(price2num($totalIT, 'MT')).' ';
+ print ''.price(price2num($totalVAT, 'MT')).' ';
print '';
- print "rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid." ";
+ print "rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid." ";
print ' ';
if (! $i) $totalarray['nbfield']++;
}
@@ -1126,7 +1126,7 @@ if ($resql)
{
print "";
- //print "rowid."&account=".$objp->fk_account."\">";
+ //print " rowid."&account=".$objp->fk_account."\">";
$reg=array();
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
@@ -1459,7 +1459,7 @@ if ($resql)
// Transaction reconciliated or edit link
if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) // If line not conciliated and account can be conciliated
{
- print ' ';
+ print ' ';
print img_edit();
print ' ';
}
@@ -1467,13 +1467,13 @@ if ($resql)
{
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
- print '';
+ print ' ';
print img_edit();
print ' ';
}
else
{
- print '';
+ print ' ';
print img_view();
print ' ';
}
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index f6633f279d5..883018b259b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -236,8 +236,13 @@ if ($action == 'update')
$error++;
}
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+ $db->begin();
+
+ if (! $error)
+ {
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+ }
if (! $error)
{
@@ -252,10 +257,20 @@ if ($action == 'update')
}
else
{
+ $error++;
setEventMessages($object->error, $object->errors, 'errors');
$action='edit'; // Force chargement page edition
}
}
+
+ if (! $error)
+ {
+ $db->commit();
+ }
+ else
+ {
+ $db->rollback();
+ }
}
if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
@@ -412,7 +427,7 @@ if ($action == 'create')
$doleditor->Create();
print ' ';
- // Other attributes
+ // 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;
@@ -639,12 +654,12 @@ else
print ''.$langs->trans("AccountancyJournal").' ';
print '';
- if ($object->fk_accountancy_journal > 0) {
- $accountingjournal = new AccountingJournal($db);
- $accountingjournal->fetch($object->fk_accountancy_journal);
+ if ($object->fk_accountancy_journal > 0) {
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($object->fk_accountancy_journal);
- print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
- }
+ print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+ }
print ' ';
+ $linkstart = ' ';
$linkend=' ';
$result .= $linkstart;
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 72ba4c82db1..ba21b6c09c1 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -23,6 +23,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
/**
* API class for accounts
*
+ * @property DoliDB db
* @access protected
* @class DolibarrApiAccess {@requires user,external}
*/
@@ -166,6 +167,142 @@ class BankAccounts extends DolibarrApi
return $account->id;
}
+ /**
+ * Create an internal wire transfer between two bank accounts
+ *
+ * @param int $bankaccount_from_id BankAccount ID to use as the source of the internal wire transfer {@from body}{@required true}
+ * @param int $bankaccount_to_id BankAccount ID to use as the destination of the internal wire transfer {@from body}{@required true}
+ * @param string $date Date of the internal wire transfer (UNIX timestamp) {@from body}{@required true}{@type timestamp}
+ * @param string $description Description of the internal wire transfer {@from body}{@required true}
+ * @param float $amount Amount to transfer from the source to the destination BankAccount {@from body}{@required true}
+ * @param float $amount_to Amount to transfer to the destination BankAccount (only when accounts does not share the same currency) {@from body}{@required false}
+ *
+ * @url POST /transfer
+ *
+ * @return array
+ *
+ * @status 201
+ *
+ * @throws 401 Unauthorized: User does not have permission to configure bank accounts
+ * @throws 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
+ * @throws 422 Unprocessable Entity: Refer to detailed exception message for the cause
+ * @throws 500 Internal Server Error: Error(s) returned by the RDBMS
+ */
+ public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
+ {
+ if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+ throw new RestException(401);
+ }
+
+ if ($bankaccount_from_id === $bankaccount_to_id) {
+ throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+ $accountfrom = new Account($this->db);
+ $resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
+
+ if ($resultAccountFrom === 0) {
+ throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
+ }
+
+ $accountto = new Account($this->db);
+ $resultAccountTo = $accountto->fetch($bankaccount_to_id);
+
+ if ($resultAccountTo === 0) {
+ throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
+ }
+
+ if ($accountto->currency_code == $accountfrom->currency_code)
+ {
+ $amount_to = $amount;
+ }
+ else
+ {
+ if (!$amount_to || empty($amount_to))
+ {
+ throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
+ }
+ }
+
+ $this->db->begin();
+
+ $error = 0;
+ $bank_line_id_from = 0;
+ $bank_line_id_to = 0;
+ $result = 0;
+ $user = DolibarrApiAccess::$user;
+
+ // By default, electronic transfert from bank to bank
+ $typefrom='PRE';
+ $typeto='VIR';
+
+ if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
+ {
+ // This is transfer of change
+ $typefrom='LIQ';
+ $typeto='LIQ';
+ }
+
+ /**
+ * Creating bank line records
+ */
+
+ if (!$error) {
+ $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1*price2num($amount), '', '', $user);
+ }
+ if (!($bank_line_id_from > 0)) {
+ $error++;
+ }
+
+ if (!$error) {
+ $bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
+ }
+ if (!($bank_line_id_to > 0)) {
+ $error++;
+ }
+
+ /**
+ * Creating links between bank line record and its source
+ */
+
+ $url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
+ $label = '(banktransfert)';
+ $type = 'banktransfert';
+
+ if (!$error) {
+ $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
+ }
+ if (!($result > 0)) {
+ $error++;
+ }
+
+ if (!$error) {
+ $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
+ }
+ if (!($result > 0)) {
+ $error++;
+ }
+
+ if (!$error)
+ {
+ $this->db->commit();
+
+ return array(
+ 'success' => array(
+ 'code' => 201,
+ 'message' => 'Internal wire transfer created successfully.'
+ )
+ );
+ }
+ else
+ {
+ $this->db->rollback();
+ throw new RestException(500, $accountfrom->error.' '.$accountto->error);
+ }
+ }
+
/**
* Update account
*
diff --git a/htdocs/compta/bank/index.html b/htdocs/compta/bank/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/compta/bank/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 7eaeb515aa9..ce9f2f5c2dc 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -45,7 +45,7 @@ $object->info($id);
$h=0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
$head[$h][1] = $langs->trans("Card");
$h++;
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/line.php
similarity index 99%
rename from htdocs/compta/bank/ligne.php
rename to htdocs/compta/bank/line.php
index 40906bfd455..2b04f83472f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/line.php
@@ -24,7 +24,7 @@
*/
/**
- * \file htdocs/compta/bank/ligne.php
+ * \file htdocs/compta/bank/line.php
* \ingroup bank
* \brief Page to edit a bank transaction record
*/
@@ -223,7 +223,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
else $sql.=", rappro = ".$rappro;
$sql.= " WHERE rowid = ".$rowid;
- dol_syslog("ligne.php", LOG_DEBUG);
+ dol_syslog("line.php", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
@@ -256,7 +256,7 @@ foreach ($cats as $cat) {
$tabs = array(
array(
- DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$rowid,
+ DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$rowid,
$langs->trans('Card')
),
array(
@@ -416,7 +416,7 @@ if ($result)
print '';
}
elseif ($links[$key]['type']=='banktransfert') {
- print '';
+ print ' ';
print img_object($langs->trans('ShowTransaction'), 'payment').' ';
print $langs->trans("TransactionOnTheOtherAccount");
print ' ';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index b93f381c555..16b71dddc8f 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -616,7 +616,7 @@ else
print ''.$type_label.' '.($objp->num_chq?$objp->num_chq:'').$link.' ';
// Description
- print '';
+ print ' ';
$reg=array();
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
@@ -662,7 +662,7 @@ else
}
elseif ($links[$key]['type']=='payment_salary')
{
- print ' ';
+ print ' ';
print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
print $langs->trans("Payment");
print ' ';
@@ -778,7 +778,7 @@ else
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
- print '';
+ print ' ';
print img_edit();
print " '.$langs->trans("Delete").' ';
+ print '';
}
else
{
- print ''.$langs->trans("Delete").' ';
+ print '';
}
}
else
{
- print ''.$langs->trans("Delete").' ';
+ print '';
}
print "";
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 61acf6e3a89..3e433b460f1 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -88,7 +88,7 @@ if (empty($backtopage)) $backtopage = dol_buildpath('/compta/cashcontrol/cashcon
$backurlforlist = dol_buildpath('/compta/cashcontrol/cashcontrol_list.php', 1);
$triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
-if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH))
+if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1))
{
setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
}
@@ -132,16 +132,7 @@ elseif ($action=="add")
$error=0;
foreach($arrayofpaymentmode as $key=>$val)
{
- if (GETPOST($key.'_amount', 'alpha') == '')
- {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
- $action='start';
- $error++;
- }
- else
- {
- $object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
- }
+ $object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
}
if (! $error)
@@ -235,7 +226,14 @@ if ($action=="create" || $action=="start")
$posmodule = GETPOST('posmodule', 'alpha');
$terminalid = GETPOST('posnumber', 'alpha');
$terminaltouse = $terminalid;
- if ($terminaltouse == '1') $terminaltouse = '';
+
+ if ($terminaltouse == '1' && $posmodule=='cashdesk') $terminaltouse = '';
+
+ if ($posmodule=='cashdesk' && $terminaltouse != '' && $terminaltouse != '1') {
+ $terminaltouse = '';
+ setEventMessages($langs->trans("OnlyTerminal1IsAvailableForCashDeskModule"), null, 'errors');
+ $error++;
+ }
// Calculate $initialbalanceforterminal for terminal 0
foreach($arrayofpaymentmode as $key => $val)
@@ -247,7 +245,7 @@ if ($action=="create" || $action=="start")
}
// Get the bank account dedicated to this point of sale module/terminal
- $vartouse=CASHDESK_ID_BANKACCOUNT_CASH.$terminaltouse;
+ $vartouse='CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse;
$bankid = $conf->global->$vartouse; // This value is ok for 'Terminal 0' for module 'CashDesk' and 'TakePos' (they manage only 1 terminal)
// Hook to get the good bank id according to posmodule and posnumber.
// @TODO add hook here
@@ -271,7 +269,7 @@ if ($action=="create" || $action=="start")
}
else
{
- setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminalid), null, 'errors');
+ setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
$error++;
}
}
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 6584af5db98..ce0cdeed9fb 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -196,10 +196,18 @@ if ($resql)
// Bank account
print '';
print $bankaccount->getNomUrl(1);
- if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
- elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
- elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount;
- else $other+=$objp->amount;
+ if ($cashcontrol->posmodule=="takepos"){
+ if ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber}==$bankaccount->id) $cash+=$objp->amount;
+ elseif ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$cashcontrol->posnumber}==$bankaccount->id) $bank+=$objp->amount;
+ elseif ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$cashcontrol->posnumber}==$bankaccount->id) $cheque+=$objp->amount;
+ else $other+=$objp->amount;
+ }
+ else{
+ if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
+ elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
+ elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount;
+ else $other+=$objp->amount;
+ }
print " \n";
if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 4b62a98b80b..38a5f88842a 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -31,7 +31,7 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -190,7 +190,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print $socialcontrib->getNomUrl(1, '20');
print '';
// Type
- print ''.$obj->lib.' '.$obj->lib.' '.price($obj->total).' ';
// Ref payment
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 968469ff1e0..ff5a280a118 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -309,6 +309,38 @@ if (empty($reshook))
dol_print_error($db, $object->error);
}
+ elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
+ {
+ $object->fetch($id);
+ $object->retained_warranty_fk_cond_reglement = 0; // To clean property
+ $result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
+ if ($result < 0) dol_print_error($db, $object->error);
+
+ $old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
+ $new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+ if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
+ if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
+ $result = $object->update($user);
+ if ($result < 0) dol_print_error($db, $object->error);
+ }
+
+ elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
+ {
+ $object->fetch($id);
+ $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
+ if ($result < 0)
+ dol_print_error($db, $object->error);
+ }
+
+ elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
+ {
+ $object->fetch($id);
+ $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
+ if ($result < 0)
+ dol_print_error($db, $object->error);
+ }
+
+
// Multicurrency Code
elseif ($action == 'setmulticurrencycode' && $usercancreate) {
$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
@@ -913,7 +945,6 @@ if (empty($reshook))
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
- $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
// Proprietes particulieres a facture de remplacement
$object->fk_facture_source = $_POST['fac_replacement'];
@@ -947,7 +978,7 @@ if (empty($reshook))
if (! $error)
{
- if(!empty($originentity)){
+ if (!empty($originentity)) {
$object->entity = $originentity;
}
$object->socid = GETPOST('socid', 'int');
@@ -969,7 +1000,6 @@ if (empty($reshook))
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
- $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
// Proprietes particulieres a facture avoir
$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -1151,7 +1181,6 @@ if (empty($reshook))
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
- $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
// Source facture
$object->fac_rec = GETPOST('fac_rec', 'int');
@@ -1202,13 +1231,22 @@ if (empty($reshook))
$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
- $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
if (GETPOST('type') == Facture::TYPE_SITUATION)
{
$object->situation_counter = 1;
$object->situation_final = 0;
$object->situation_cycle_ref = $object->newCycle();
+
+
+ $object->retained_warranty = GETPOST('retained_warranty', 'int');
+ $object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+
+ $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+ if(!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)){
+ $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+ }
+ $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
}
$object->fetch_thirdparty();
@@ -2449,7 +2487,7 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
// Actions to build doc
- $upload_dir = $conf->facture->dir_output;
+ $upload_dir = $conf->facture->multidir_output[$object->entity];
$permissioncreate=$usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
@@ -2723,7 +2761,8 @@ if ($action == 'create')
print $soc->getNomUrl(1);
print '' . $langs->trans('RetainedWarranty') . ' ';
+ print ' ' . $langs->trans('PaymentConditionsShortRetainedWarranty') . ' ';
+ $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+ $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement)? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+ $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+ print ' ' . $langs->trans('PaymentMode') . ' ';
$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
@@ -3236,8 +3313,8 @@ if ($action == 'create')
'__INVOICE_PREVIOUS_MONTH_TEXT__' => $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B').')',
'__INVOICE_MONTH_TEXT__' => $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%B').')',
'__INVOICE_NEXT_MONTH_TEXT__' => $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')',
- '__INVOICE_PREVIOUS_YEAR__' => $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')',
- '__INVOICE_YEAR__' => $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')',
+ '__INVOICE_PREVIOUS_YEAR__' => $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')',
+ '__INVOICE_YEAR__' => $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')',
'__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y').')'
);
@@ -4020,6 +4097,126 @@ elseif ($id > 0 || ! empty($ref))
print ' ';
+ print '';
+ print ' ';
+ if ($action == 'editretainedwarranty')
+ {
+ print '';
+ }
+ else
+ {
+ print price($object->retained_warranty).'%';
+ }
+ print ' ';
+ print '';
+ print ' ';
+ $defaultDate = !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
+ if($object->date > $defaultDate){
+ $defaultDate = $object->date;
+ }
+
+ if ($action == 'editretainedwarrantypaymentterms')
+ {
+ //date('Y-m-d',$object->date_lim_reglement)
+ print '';
+ }
+ else
+ {
+ print $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+ if(!$displayWarranty){
+ print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
+ }
+ }
+ print ' ';
+ print '';
+ print ' ';
+ $defaultDate = !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
+ if($object->date > $defaultDate){
+ $defaultDate = $object->date;
+ }
+
+ if ($action == 'editretainedwarrantydatelimit')
+ {
+ //date('Y-m-d',$object->date_lim_reglement)
+ print '';
+ }
+ else
+ {
+ print dol_print_date($object->retained_warranty_date_limit, 'day');
+ }
+ print ' ' . price($resteapayeraffiche) . ' ';
print ' ';
+
+ // Retained warranty : usualy use on construction industry
+ if(!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty){
+
+ // Billed - retained warranty
+ if($object->type == Facture::TYPE_SITUATION)
+ {
+ $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
+ }
+ else
+ {
+ // Because one day retained warranty could be used on standard invoices
+ $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
+ }
+
+ $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
+
+ print '' . $langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')) . ' : ' . price($billedWithRetainedWarranty) . ' ';
+ print $langs->trans("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
+ print !empty($object->retained_warranty_date_limit)?' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
+ print ' : ' . price($retainedWarranty) . ' ';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 2982246c6d9..dd3f2add4ba 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -182,6 +182,12 @@ $arrayfields=array(
'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
);
+
+if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+{
+ $arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0);
+}
+
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -373,6 +379,10 @@ $sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
$sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
$sql.= ' f.paye as paye, f.fk_statut,';
$sql.= ' f.datec as date_creation, f.tms as date_update,';
+if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+{
+ $sql.= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final,f.situation_cycle_ref,f.situation_counter,';
+}
$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
$sql.= " typent.code as typent_code,";
$sql.= " state.code_departement as state_code, state.nom as state_name,";
@@ -605,7 +615,7 @@ if ($resql)
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
$newcardbutton='';
- if($user->rights->facture->creer)
+ if($user->rights->facture->creer && $contextpage != 'poslist')
{
$newcardbutton.= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/facture/card.php?action=create');
}
@@ -687,7 +697,7 @@ if ($resql)
$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
- if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+ if ($massactionbutton && $contextpage != 'poslist') $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
print '';
print '
'."\n";
@@ -834,6 +844,13 @@ if ($resql)
print '';
+ print ' ';
+ }
+
if (! empty($arrayfields['dynamount_payed']['checked']))
{
print '';
@@ -899,6 +916,7 @@ if ($resql)
if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['f.retained_warranty']['checked'])) print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
// Extra fields
@@ -939,7 +957,15 @@ if ($resql)
$facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
$facturestatic->note_public=$obj->note_public;
$facturestatic->note_private=$obj->note_private;
-
+ if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+ {
+ $facturestatic->retained_warranty=$obj->retained_warranty;
+ $facturestatic->retained_warranty_date_limit=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_final=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_final=$obj->retained_warranty_date_limit;
+ $facturestatic->situation_cycle_ref=$obj->situation_cycle_ref;
+ $facturestatic->situation_counter=$obj->situation_counter;
+ }
$thirdpartystatic->id=$obj->socid;
$thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=$obj->client;
@@ -1068,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']++;
}
@@ -1181,6 +1214,11 @@ if ($resql)
$totalarray['totalttc'] += $obj->total_ttc;
}
+ if(! empty($arrayfields['f.retained_warranty']['checked']))
+ {
+ print ''.(! empty($obj->retained_warranty)?price($obj->retained_warranty).'%':' ').' ';
+ }
+
if (! empty($arrayfields['dynamount_payed']['checked']))
{
print ''.(! empty($totalpay)?price($totalpay, 0, $langs):' ').' '; // TODO Use a denormalized field
@@ -1200,7 +1238,7 @@ if ($resql)
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
@@ -1230,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/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index ccc3b305447..db022259e35 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -62,42 +62,52 @@ if ($id > 0 || ! empty($ref))
}
}
+$hookmanager->initHooks(array('directdebitcard','globalcard'));
+
+
/*
* Actions
*/
-if ($action == "new")
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
{
- if ($object->id > 0)
+ if ($action == "new")
{
- $db->begin();
-
- $result = $object->demande_prelevement($user, GETPOST('withdraw_request_amount'));
- if ($result > 0)
+ if ($object->id > 0)
{
- $db->commit();
+ $db->begin();
- setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
- }
- else
- {
- $db->rollback();
- setEventMessages($object->error, $object->errors, 'errors');
+ $result = $object->demande_prelevement($user, GETPOST('withdraw_request_amount'));
+ if ($result > 0)
+ {
+ $db->commit();
+
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+ }
+ else
+ {
+ $db->rollback();
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
+ $action='';
}
- $action='';
-}
-if ($action == "delete")
-{
- if ($object->id > 0)
+ if ($action == "delete")
{
- $result = $object->demande_prelevement_delete($user, GETPOST('did'));
- if ($result == 0)
+ if ($object->id > 0)
{
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
+ $result = $object->demande_prelevement_delete($user, GETPOST('did'));
+ if ($result == 0)
+ {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
}
}
}
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index a9fbb5da2eb..bef705a21ab 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -38,7 +38,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
-$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc');
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
$total=0; $ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 932d9ed758c..e2c0180dc3b 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -412,8 +412,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print ' ';
print $thirdpartystatic->getNomUrl(1, 'customer', 44);
print ' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
+ print ''.price($obj->total_ttc).' ';
print ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).' ';
print '';
@@ -512,7 +512,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
print '';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
print ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).' ';
print '';
@@ -593,7 +593,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
print '';
print ''.$donationstatic->getNomUrl(1).' ';
print ''.$label.' ';
- print ''.price($objp->amount).' ';
+ print ''.price($objp->amount).' ';
print ''.dol_print_date($db->jdate($objp->dm), 'day').' ';
print ''.$donationstatic->LibStatut($objp->fk_statut, 3).' ';
print ' ';
@@ -664,8 +664,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '';
print ''.$chargestatic->getNomUrl(1).' ';
print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
- print ''.price($obj->amount).' ';
- print ''.price($obj->sumpaid).' ';
+ print ''.price($obj->amount).' ';
+ print ''.price($obj->sumpaid).' ';
print ''.$chargestatic->getLibStatut(3).' ';
print ' ';
$tot_ttc+=$obj->amount;
@@ -673,7 +673,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
}
print ''.$langs->trans("Total").' ';
- print ''.price($tot_ttc).' ';
+ print ''.price($tot_ttc).' ';
print ' ';
print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->total_ttc-$obj->tot_fttc).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc-$obj->tot_fttc).' ';
print ''.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).' ';
print '';
$tot_ht += $obj->total_ht;
@@ -799,8 +799,8 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($tot_ht).' ';
- print ''.price($tot_ttc).' ';
- print ''.price($tot_tobill).' ';
+ print ''.price($tot_ttc).' ';
+ print ''.price($tot_tobill).' ';
print ' ';
print '
'.dol_print_date($db->jdate($obj->datelimite), 'day').' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->am).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->am).' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).' ';
print ' ';
@@ -926,8 +926,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).') ';
print ' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
- print ''.price($total_ttc).' ';
- print ''.price($totalam).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print ''.$societestatic->getNomUrl(1, 'supplier', 44).' ';
print ''.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
- print ''.price($obj->total_ttc).' ';
- print ''.price($obj->am).' ';
+ print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->am).' ';
print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).' ';
print '';
$total += $obj->total_ht;
@@ -1036,8 +1036,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print ''.$langs->trans("Total").' ('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).') ';
print ' ';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
- print ''.price($total_ttc).' ';
- print ''.price($totalam).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print ''.$alreadypayedlabel.' ';
print ''.$remaindertopay.' ';
print ''.$langs->trans('PaymentAmount').' ';
- print ' ';
+
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $facture, $action); // Note that $action and $object may have been modified by hook
+
+ print ' ';
print "\n";
$total=0;
@@ -744,6 +748,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print "";
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+
// Warning
print '';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]." ';
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
-
print "\n";
$total+=$objp->total;
@@ -804,9 +808,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($action != 'add_paiement')
{
$checkboxlabel=$langs->trans("ClosePaidInvoicesAutomatically");
- if ($facture->type == 2) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
+ if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
$buttontitle=$langs->trans('ToMakePayment');
- if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack');
+ if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle=$langs->trans('ToMakePaymentBack');
print '';
print '
'.$checkboxlabel;
@@ -893,12 +897,13 @@ if (! GETPOST('action', 'aZ09'))
print '
'.$objp->ref." \n";
print '
'.dol_print_date($db->jdate($objp->dp))." \n";
print '
'.$objp->paiement_type.' '.$objp->num_paiement." \n";
- print '
'.price($objp->amount).' ';
-
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
-
+ print '
'.price($objp->amount).' ';
+ print '
';
print '';
+
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+
$i++;
}
print '
';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index d9a912ea50b..316215a5caf 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -489,7 +489,7 @@ class RemiseCheque extends CommonObject
else
{
$langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
return "";
}
}
@@ -527,6 +527,7 @@ class RemiseCheque extends CommonObject
$response = new WorkboardResponse();
$response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
$response->label=$langs->trans("BankChecksToReceipt");
+ $response->labelShort=$langs->trans("BankChecksToReceiptShort");
$response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank';
$response->img=img_object('', "payment");
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index a3c79d23602..614782c519b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1141,7 +1141,7 @@ class Paiement extends CommonObject
else
{
$langs->load("errors");
- print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
return "";
}
}
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index d31efcc9df8..301f2f532b1 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -63,78 +63,86 @@ $object = new BonPrelevement($db, "");
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+$hookmanager->initHooks(array('directdebitprevcard','globalcard'));
/*
* Actions
*/
-if ( $action == 'confirm_delete' )
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
{
- $res=$object->delete($user);
- if ($res > 0)
+ if ( $action == 'confirm_delete' )
+ {
+ $res=$object->delete($user);
+ if ($res > 0)
+ {
+ header("Location: index.php");
+ exit;
+ }
+ }
+
+ // Seems to no be used and replaced with $action == 'infocredit'
+ if ( $action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
+ {
+ $res=$object->set_credite();
+ if ($res >= 0)
+ {
+ header("Location: card.php?id=".$id);
+ exit;
+ }
+ }
+
+ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+ $dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+
+ /*
+ if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
+ {
+ $dir = $conf->prelevement->dir_output.'/receipts';
+
+ if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
+ {
+ $object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+ }
+
+ header("Location: card.php?id=".$id);
+ exit;
+ }
+ else
+ {
+ dol_syslog("Fichier invalide",LOG_WARNING);
+ $mesg='BadFile';
+ }*/
+
+ $error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
+
+ if ($error)
+ {
+ header("Location: card.php?id=".$id."&error=$error");
+ exit;
+ }
+ }
+
+ // Set direct debit order to credited, create payment and close invoices
+ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
{
- header("Location: index.php");
- exit;
- }
-}
+ $dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-// Seems to no be used and replaced with $action == 'infocredit
-if ( $action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
-{
- $res=$object->set_credite();
- if ($res >= 0)
- {
- header("Location: card.php?id=".$id);
- exit;
- }
-}
+ $error = $object->set_infocredit($user, $dt);
-if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
-{
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
- $dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-
- /*
- if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
- {
- $dir = $conf->prelevement->dir_output.'/receipts';
-
- if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
- {
- $object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
- }
-
- header("Location: card.php?id=".$id);
- exit;
- }
- else
- {
- dol_syslog("Fichier invalide",LOG_WARNING);
- $mesg='BadFile';
- }*/
-
- $error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
-
- if ($error)
- {
- header("Location: card.php?id=".$id."&error=$error");
- exit;
- }
-}
-
-// Set direct debit order to credited, create payment and close invoices
-if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
-{
- $dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-
- $error = $object->set_infocredit($user, $dt);
-
- if ($error)
- {
- header("Location: card.php?id=".$id."&error=$error");
- exit;
- }
+ if ($error)
+ {
+ header("Location: card.php?id=".$id."&error=$error");
+ exit;
+ }
+ }
}
@@ -362,7 +370,7 @@ if ($id > 0 || $ref)
print "
";
print $ligne->LibStatut($obj->statut, 2);
print " ";
- print '';
+ print ' ';
print sprintf("%06s", $obj->rowid);
print ' ';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 21cbd6dbfc4..a60330270d4 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1133,32 +1133,56 @@ class BonPrelevement extends CommonObject
/**
- * Get object and lines from database
+ * Get object and lines from database
*
* @param User $user Object user that delete
- * @return int >0 if OK, <0 if KO
+ * @param int $notrigger 1=Does not execute triggers, 0= execute triggers
+ * @return int >0 if OK, <0 if KO
*/
- public function delete($user = null)
+ public function delete($user = null, $notrigger = 0)
{
$this->db->begin();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
- $resql1=$this->db->query($sql);
- if (! $resql1) dol_print_error($this->db);
+ $error = 0;
+ $resql1 = $resql2 = $resql3 = $resql4 = 0;
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
- $resql2=$this->db->query($sql);
- if (! $resql2) dol_print_error($this->db);
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('BON_PRELEVEMENT_DELETE', $user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
- $resql3=$this->db->query($sql);
- if (! $resql3) dol_print_error($this->db);
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
+ $resql1=$this->db->query($sql);
+ if (! $resql1) dol_print_error($this->db);
+ }
- $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
- $resql4=$this->db->query($sql);
- if (! $resql4) dol_print_error($this->db);
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
+ $resql2=$this->db->query($sql);
+ if (! $resql2) dol_print_error($this->db);
+ }
- if ($resql1 && $resql2 && $resql3)
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
+ $resql3=$this->db->query($sql);
+ if (! $resql3) dol_print_error($this->db);
+ }
+
+ if (! $error)
+ {
+ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
+ $resql4=$this->db->query($sql);
+ if (! $resql4) dol_print_error($this->db);
+ }
+
+ if ($resql1 && $resql2 && $resql3 && $resql4 && ! $error)
{
$this->db->commit();
return 1;
@@ -1393,7 +1417,7 @@ class BonPrelevement extends CommonObject
$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
- $sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
+ $sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
$sql.= " FROM";
$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
$sql.= " ".MAIN_DB_PREFIX."facture as f,";
@@ -1419,7 +1443,8 @@ class BonPrelevement extends CommonObject
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
- $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->fac, $obj->idfac, $obj->iban, $obj->bic, $this->db->jdate($obj->datec), $obj->drum);
+ $daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
+ $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->fac, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum);
$this->total = $this->total + $obj->somme;
$i++;
}
@@ -1624,15 +1649,16 @@ class BonPrelevement extends CommonObject
* @param string $row_cg pl.code_guichet AS cg, Not used for SEPA
* @param string $row_cc pl.number AS cc, Not used for SEPA
* @param string $row_somme pl.amount AS somme,
- * @param string $row_ref f.ref
+ * @param string $row_ref f.ref
* @param string $row_idfac pf.fk_facture AS idfac,
* @param string $row_iban rib.iban_prefix AS iban,
* @param string $row_bic rib.bic AS bic,
* @param string $row_datec rib.datec,
* @param string $row_drum rib.rowid used to generate rum
+ * @param string $row_rum rib.rum Rum defined on company bank account
* @return string Return string with SEPA part DrctDbtTxInf
*/
- public function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_ref, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
+ public function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_ref, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum, $row_rum)
{
// phpcs:enable
global $conf;
@@ -1644,7 +1670,7 @@ class BonPrelevement extends CommonObject
// Define value for RUM
// Example: RUMCustomerCode-CustomerBankAccountId-01424448606 (note: Date is date of creation of CustomerBankAccountId)
- $Rum = $this->buildRumNumber($row_code_client, $row_datec, $row_drum);
+ $Rum = empty($row_rum) ? $this->buildRumNumber($row_code_client, $row_datec, $row_drum) : $row_rum;
// Define date of RUM signature
$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 747bbdf828d..eaef92a1abc 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -52,42 +52,52 @@ $page = GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
+$hookmanager->initHooks(array('directdebitcreatecard','globalcard'));
+
+
/*
* Actions
*/
-// Change customer bank information to withdraw
-if ($action == 'modify')
-{
- for ($i = 1 ; $i < 9 ; $i++)
- {
- dolibarr_set_const($db, GETPOST("nom$i"), GETPOST("value$i"), 'chaine', 0, '', $conf->entity);
- }
-}
-if ($action == 'create')
-{
- // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
- $bprev = new BonPrelevement($db);
- $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), (GETPOST('reday')+$conf->global->PRELEVEMENT_ADDDAYS), GETPOST('reyear'));
+$parameters = array('mode' => $mode, 'format' => $format, 'limit' => $limit, 'page' => $page, 'offset' => $offset);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate);
- if ($result < 0)
+if (empty($reshook))
+{
+ // Change customer bank information to withdraw
+ if ($action == 'modify')
{
- setEventMessages($bprev->error, $bprev->errors, 'errors');
- }
- elseif ($result == 0)
- {
- $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed", $format);
- setEventMessages($mesg, null, 'errors');
- $mesg.='
'."\n";
- foreach($bprev->invoice_in_error as $key => $val)
+ for ($i = 1 ; $i < 9 ; $i++)
{
- $mesg.='
'.$val." \n";
+ dolibarr_set_const($db, GETPOST("nom$i"), GETPOST("value$i"), 'chaine', 0, '', $conf->entity);
}
}
- else
+ if ($action == 'create')
{
- setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
+ // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
+ $bprev = new BonPrelevement($db);
+ $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), (GETPOST('reday')+$conf->global->PRELEVEMENT_ADDDAYS), GETPOST('reyear'));
+
+ $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate);
+ if ($result < 0)
+ {
+ setEventMessages($bprev->error, $bprev->errors, 'errors');
+ }
+ elseif ($result == 0)
+ {
+ $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed", $format);
+ setEventMessages($mesg, null, 'errors');
+ $mesg.='
'."\n";
+ foreach($bprev->invoice_in_error as $key => $val)
+ {
+ $mesg.='
'.$val." \n";
+ }
+ }
+ else
+ {
+ setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
+ }
}
}
@@ -106,7 +116,7 @@ llxHeader('', $langs->trans("NewStandingOrder"));
if (prelevement_check_config() < 0)
{
$langs->load("errors");
- setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+ setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
}
/*$h=0;
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index c930db99012..0e4d28fde2f 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -203,7 +203,7 @@ if ($resql)
print '
';
- print '';
+ print ' ';
print img_picto('', 'statut'.$obj->statut).' ';
print substr('000000'.$obj->rowid, -6);
print ' ';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4e2c4e2d3a5..1be716f8f61 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -58,7 +58,7 @@ llxHeader('', $langs->trans("CustomersStandingOrdersArea"));
if (prelevement_check_config() < 0)
{
$langs->load("errors");
- setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+ setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
}
print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/line.php
similarity index 95%
rename from htdocs/compta/prelevement/ligne.php
rename to htdocs/compta/prelevement/line.php
index 8b11716bf6f..c9004c04d26 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/line.php
@@ -20,7 +20,7 @@
*/
/**
- * \file htdocs/compta/prelevement/ligne.php
+ * \file htdocs/compta/prelevement/line.php
* \ingroup prelevement
* \brief card of withdraw line
*/
@@ -86,7 +86,7 @@ if ($action == 'confirm_rejet')
$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -97,7 +97,7 @@ if ($action == 'confirm_rejet')
}
else
{
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -112,7 +112,7 @@ $invoicestatic=new Facture($db);
llxHeader('', $langs->trans("StandingOrder"));
$h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id;
$head[$h][1] = $langs->trans("Card");
$hselected = $h;
$h++;
@@ -179,7 +179,7 @@ if ($id)
$rej = new RejetPrelevement($db, $user);
- print '