*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -33,6 +33,9 @@ $langs->loadLangs(array("compta","bills","other","accountancy","loans","banks","
if ($user->societe_id > 0)
accessforbidden();
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$hookmanager->initHooks(array('accountancyindex'));
+
/*
* Actions
*/
@@ -52,10 +55,10 @@ $step = 0;
if ($conf->accounting->enabled)
{
- print $langs->trans("AccountancyAreaDescIntro")."'.$langs->trans("AccountancyAreaDescIntro")." '.$langs->trans("Facebook").' '.$langs->trans("LinkedIn").' ".$langs->trans("Birthday")." \n";
print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
@@ -1281,10 +1290,16 @@ else
}
// Facebook
- if (! empty($conf->socialnetworks->enabled))
- {
- print ' '.$langs->trans("Facebook").' '.$langs->trans("Facebook").' '.$langs->trans("LinkedIn").' ".$langs->trans("Birthday")." \n";
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 22429de9200..66ee5ee16f2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -137,6 +137,11 @@ class Adherent extends CommonObject
*/
public $facebook;
+ /**
+ * @var string linkedin account
+ */
+ public $linkedin;
+
/**
* @var string Phone number
*/
@@ -550,6 +555,7 @@ class Adherent extends CommonObject
$sql.= ", skype = '".$this->db->escape($this->skype)."'";
$sql.= ", twitter = '".$this->db->escape($this->twitter)."'";
$sql.= ", facebook = '".$this->db->escape($this->facebook)."'";
+ $sql.= ", linkedin = '".$this->db->escape($this->linkedin)."'";
$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
$sql.= ", phone_perso = ".($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
$sql.= ", phone_mobile = ".($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
@@ -660,6 +666,7 @@ class Adherent extends CommonObject
$luser->skype=$this->skype;
$luser->twitter=$this->twitter;
$luser->facebook=$this->facebook;
+ $luser->linkedin=$this->linkedin;
$luser->office_phone=$this->phone;
$luser->user_mobile=$this->phone_mobile;
@@ -701,6 +708,7 @@ class Adherent extends CommonObject
$lthirdparty->skype=$this->skype;
$lthirdparty->twitter=$this->twitter;
$lthirdparty->facebook=$this->facebook;
+ $lthirdparty->linkedin=$this->linkedin;
$lthirdparty->phone=$this->phone;
$lthirdparty->state_id=$this->state_id;
$lthirdparty->country_id=$this->country_id;
@@ -1189,7 +1197,7 @@ class Adherent extends CommonObject
$sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.gender, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
$sql.= " d.note_public,";
- $sql.= " d.email, d.skype, d.twitter, d.facebook, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
+ $sql.= " d.email, d.skype, d.twitter, d.facebook, d.linkedin, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
$sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
$sql.= " d.datec as datec,";
$sql.= " d.tms as datem,";
@@ -1266,6 +1274,7 @@ class Adherent extends CommonObject
$this->skype = $obj->skype;
$this->twitter = $obj->twitter;
$this->facebook = $obj->facebook;
+ $this->linkedin = $obj->linkedin;
$this->photo = $obj->photo;
$this->statut = $obj->statut;
@@ -2362,6 +2371,7 @@ class Adherent extends CommonObject
$this->skype = 'skypepseudo';
$this->twitter = 'twitterpseudo';
$this->facebook = 'facebookpseudo';
+ $this->linkedin = 'linkedinpseudo';
$this->phone = '0999999999';
$this->phone_perso = '0999999998';
$this->phone_mobile = '0999999997';
@@ -2469,8 +2479,9 @@ class Adherent extends CommonObject
if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY)) $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE)) $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
if ($this->twitter && ! empty($conf->global->LDAP_MEMBER_FIELD_TWITTER)) $info[$conf->global->LDAP_MEMBER_FIELD_TWITTER] = $this->twitter;
- if ($this->facebook && ! empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK)) $info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook;
- if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
+ if ($this->facebook && ! empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK)) $info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook;
+ if ($this->linkedin && ! empty($conf->global->LDAP_MEMBER_FIELD_LINKEDIN)) $info[$conf->global->LDAP_MEMBER_FIELD_LINKEDIN] = $this->linkedin;
+ if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX)) $info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 53a1c2bc7f8..e123669342d 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -87,8 +87,8 @@ $arrayfields=array(
'c.dateadh'=>array('label'=>$langs->trans("DateSubscription"), 'checked'=>1, 'position'=>100),
'c.datef'=>array('label'=>$langs->trans("EndSubscription"), 'checked'=>1, 'position'=>101),
'd.amount'=>array('label'=>$langs->trans("Amount"), 'checked'=>1, 'position'=>102),
- 'd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
- 'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+ 'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+ 'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
// 'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
);
@@ -367,13 +367,13 @@ $parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
-if (! empty($arrayfields['d.datec']['checked']))
+if (! empty($arrayfields['c.datec']['checked']))
{
print ' ';
print ' ';
}
// Date modification
-if (! empty($arrayfields['d.tms']['checked']))
+if (! empty($arrayfields['c.tms']['checked']))
{
print '';
print ' ';
@@ -436,9 +436,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (! empty($arrayfields['d.datec']['checked'])) print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['d.tms']['checked'])) print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print "';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
@@ -561,7 +561,7 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// Date modification
- if (! empty($arrayfields['d.tms']['checked']))
+ if (! empty($arrayfields['c.tms']['checked']))
{
print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index c9ba17d2461..4a2d22e176d 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -151,14 +151,14 @@ print "";
print "";
print ''.$langs->trans("Parameter")." ";
-print ''.$langs->trans("Value")." ";
+print ''.$langs->trans("Value")." ";
print " ";
// Show external agenda
print '';
print "".$langs->trans("ExtSitesEnableThisTool")." ";
-print '';
+print ' ';
if ($conf->use_javascript_ajax)
{
print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
@@ -181,7 +181,7 @@ print " ";
print '';
print "".$langs->trans("ExtSitesNbOfAgenda")." ";
-print '';
+print ' ';
print ' ";
print " ";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index f78cd42034c..ce9db532f21 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -225,10 +225,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print ''."\n";
print ''.$langs->trans("Name").' '."\n";
print ''.$langs->trans("Description").' '."\n";
- print ''.$langs->trans("Status").' '."\n";
- print ''.$langs->trans("Default").' '."\n";
- print ''.$langs->trans("ShortInfo").' ';
- print ''.$langs->trans("Preview").' ';
+ print ''.$langs->trans("Status").' '."\n";
+ print ''.$langs->trans("Default").' '."\n";
+ print ''.$langs->trans("ShortInfo").' ';
+ print ''.$langs->trans("Preview").' ';
print ' '."\n";
clearstatcache();
@@ -269,7 +269,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
if (in_array($name, $def))
{
- print ''."\n";
+ print ' '."\n";
if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
{
print 'scandir.'&label='.urlencode($module->name).'&type=action">';
@@ -284,13 +284,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
}
else
{
- print ' '."\n";
+ print ' '."\n";
print 'scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
// Default
- print '';
+ print ' ';
if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"), 'on');
@@ -307,10 +307,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
$htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
$htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
- print '';
+ print ' ';
print ''.img_object($langs->trans("Preview"), 'order').' ';
print ' ';
@@ -330,7 +330,7 @@ print ''."\n";
print ''."\n";
print ''.$langs->trans("Parameters").' '."\n";
-print ' '."\n";
+print ' '."\n";
print ''.$langs->trans("Value").' '."\n";
print ' '."\n";
@@ -338,7 +338,7 @@ print ''."\n";
print ''."\n";
print ''.$langs->trans("AGENDA_USE_EVENT_TYPE").' '."\n";
-print ' '."\n";
+print ' '."\n";
print ''."\n";
//print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list
if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
@@ -355,7 +355,7 @@ print ' '."\n";
print ''."\n";
$htmltext=$langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
print ''.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).' '."\n";
-print ' '."\n";
+print ' '."\n";
print ''."\n";
$tmplist=array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
@@ -367,8 +367,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
print '';
print ' '."\n";
print ''.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").' '."\n";
- print ' '."\n";
- print ''."\n";
+ print ' '."\n";
+ print ''."\n";
$formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
print ' '."\n";
}
@@ -376,8 +376,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
// AGENDA_DEFAULT_FILTER_TYPE
print ''."\n";
print ''.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n";
-print ' '."\n";
-print ''."\n";
+print ' '."\n";
+print ''."\n";
$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1);
print ' '."\n";
@@ -385,7 +385,7 @@ print ''."\n";
// TODO Remove to use the default generic feature
print ''."\n";
print ''.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").' '."\n";
-print ' '."\n";
+print ' '."\n";
print ''."\n";
$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
print ' '."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index d92ce1ee213..3af179ba2e7 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -185,17 +185,17 @@ print ''."\n";
print ''."\n";
print ''.$langs->trans("Parameters").' '."\n";
-print ' '."\n";
+print ' '."\n";
print ''.$langs->trans("Value").' '."\n";
print ' '."\n";
// AGENDA REMINDER EMAIL
-if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+if ($conf->global->MAIN_FEATURES_LEVEL == 2)
{
print ''."\n";
print ''.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).' '."\n";
- print ' '."\n";
+ print ' '."\n";
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
@@ -208,11 +208,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
}
// AGENDA REMINDER BROWSER
-if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+if ($conf->global->MAIN_FEATURES_LEVEL == 2)
{
print ' '."\n";
print ''.$langs->trans('AGENDA_REMINDER_BROWSER').' '."\n";
- print ' '."\n";
+ print ' '."\n";
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
@@ -224,7 +224,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0)
print ' '."\n";
print ''.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').' '."\n";
- print ' '."\n";
+ print ' '."\n";
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 34becb49ada..9fc256540a2 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -183,8 +183,8 @@ print ' ';
print '' . $langs->trans("Name") . ' ';
print '' . $langs->trans("Description") . ' ';
print '' . $langs->trans("Example") . ' ';
-print '' . $langs->trans("Status") . ' ';
-print ' ';
+print '' . $langs->trans("Status") . ' ';
+print ' ';
print " \n";
$bankorder[0][0] = $langs->trans("BankOrderGlobal");
@@ -213,12 +213,12 @@ while ($i < $nbofbank) {
print "\n";
if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'on');
print ' ';
}
else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'off');
print ' \n";
print "\n";
print '' . $langs->trans("Name") . ' ';
print '' . $langs->trans("Description") . ' ';
-print '' . $langs->trans("Status") . " \n";
-print '' . $langs->trans("Default") . " \n";
-print '' . $langs->trans("ShortInfo") . ' ';
-print '' . $langs->trans("Preview") . ' ';
+print '' . $langs->trans("Status") . " \n";
+print '' . $langs->trans("Default") . " \n";
+print '' . $langs->trans("ShortInfo") . ' ';
+print '' . $langs->trans("Preview") . ' ';
print " \n";
clearstatcache();
@@ -315,7 +315,7 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
- print '' . "\n";
+ print ' ' . "\n";
print '';
print img_picto($langs->trans("Enabled"),
'switch_on');
@@ -323,14 +323,14 @@ foreach ($dirmodels as $reldir) {
print ' ';
}
else {
- print '' . "\n";
+ print ' ' . "\n";
print '' . img_picto($langs->trans("Disabled"),
'switch_off') . ' ';
print " ";
}
// Default
- print '';
+ print ' ';
if ($conf->global->BANKADDON_PDF == $name) {
print img_picto($langs->trans("Default"),
'on');
@@ -358,13 +358,13 @@ foreach ($dirmodels as $reldir) {
// $htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1,
0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf') {
print '' . img_object($langs->trans("Preview"),
'bill') . ' ';
@@ -404,7 +404,7 @@ print "\n";
print "\n";
print '' . $langs->trans("Name") . ' ';
print '' . $langs->trans("Description") . ' ';
-print '' . $langs->trans("Status") . " \n";
+print '' . $langs->trans("Status") . " \n";
print " \n";
print '';
@@ -414,7 +414,7 @@ print $langs->trans('AutoReportLastAccountStatement');
print ' ';
// Active
if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
- print '' . "\n";
+ print ' ' . "\n";
print '';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
@@ -422,7 +422,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
}
else
{
- print ' ' . "\n";
+ print ' ' . "\n";
print '' . img_picto($langs->trans("Disabled"),
'switch_off') . ' ';
print " ";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 92b1c73060d..e811eaff261 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -199,8 +199,8 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("CodeBarGenerator").' ';
+print ''.$langs->trans("Example").' ';
+print ''.$langs->trans("CodeBarGenerator").' ';
print " \n";
$sql = "SELECT rowid, code as encoding, libelle, coder, example";
@@ -229,7 +229,7 @@ if ($resql)
print '';
// Show example
- print '';
+ print ' ';
if ($obj->coder && $obj->coder != -1)
{
$result=0;
@@ -277,7 +277,7 @@ if ($resql)
}
print ' ';
- print '';
+ print ' ';
print $formbarcode->setBarcodeEncoder($obj->coder, $barcodelist, $obj->rowid, 'form'.$i);
print " \n";
@@ -307,7 +307,7 @@ print "';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ''.$langs->trans("Value").' ';
print ' ';
print ' ';
@@ -317,7 +317,7 @@ if (! isset($_SERVER['WINDIR']))
print '';
print ''.$langs->trans("GenbarcodeLocation").' ';
- print '';
+ print ' ';
print ' '.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
- print ''.$langs->trans("Status").' ';
- print ''.$langs->trans("ShortInfo").' ';
+ print ''.$langs->trans("Status").' ';
+ print ''.$langs->trans("ShortInfo").' ';
print " \n";
$dirbarcodenum=array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -406,17 +406,17 @@ if ($conf->produit->enabled)
if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
{
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
+ print ' ';
$s=$modBarCode->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print ' ';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 3cee6aa27f4..70672f9b6fb 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -337,7 +337,7 @@ print '';
print ''.$langs->trans("Box").' ';
print ''.$langs->trans("Note").'/'.$langs->trans("Parameters").' ';
print ''.$langs->trans("SourceFile").' ';
-print ''.$langs->trans("ActivateOn").' ';
+print ''.$langs->trans("ActivateOn").' ';
print " \n";
foreach($boxtoadd as $box)
@@ -398,9 +398,9 @@ print ''."\n";
print '';
print ''.$langs->trans("Box").' ';
print ''.$langs->trans("Note").'/'.$langs->trans("Parameters").' ';
-print ''.$langs->trans("ActiveOn").' ';
-print ''.$langs->trans("PositionByDefault").' ';
-print ''.$langs->trans("Disable").' ';
+print ''.$langs->trans("ActiveOn").' ';
+print ''.$langs->trans("PositionByDefault").' ';
+print ''.$langs->trans("Disable").' ';
print ' '."\n";
$box_order=1;
@@ -429,15 +429,15 @@ foreach($boxactivated as $key => $box)
}
else print ($box->note?$box->note:' ');
print '';
- print '' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . ' ';
+ print '' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . ' ';
$hasnext=($key < (count($boxactivated)-1));
$hasprevious=($key != 0);
- print ''.($key+1).' ';
- print '';
+ print ' '.($key+1).' ';
+ print '';
print ($hasnext?''.img_down().' ':'');
print ($hasprevious?''.img_up().' ':'');
print ' ';
- print '';
+ print ' ';
print ''.img_delete().' ';
print ' ';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 4efa3bc487b..e8e035f8b49 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -116,8 +116,8 @@ print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("Status").' ';
-print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
print ' '."\n";
clearstatcache();
@@ -177,7 +177,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print ''."\n";
- print '';
+ print ' ';
if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file)
{
print img_picto($langs->trans("Activated"), 'switch_on');
@@ -206,7 +206,7 @@ foreach ($dirmodels as $reldir)
}
}
- print ' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
if ($conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) // If module is the one used, we show existing errors
@@ -244,7 +244,7 @@ print ' ';
print ''.$langs->trans("Parameters").' ';
-print ' ';
+print ' ';
print ' ';
print " \n";
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3dc59b1b247..1f3e23e05d6 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -267,8 +267,8 @@ print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("Status").' ';
-print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
print ' '."\n";
clearstatcache();
@@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print ''."\n";
- print '';
+ print ' ';
if ($conf->global->COMMANDE_ADDON == $file)
{
print img_picto($langs->trans("Activated"), 'switch_on');
@@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir)
}
}
- print ' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
@@ -393,10 +393,10 @@ print "\n";
print "\n";
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Status")." \n";
-print ''.$langs->trans("Default")." \n";
-print ''.$langs->trans("ShortInfo").' ';
-print ''.$langs->trans("Preview").' ';
+print ''.$langs->trans("Status")." \n";
+print ''.$langs->trans("Default")." \n";
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
print " \n";
clearstatcache();
@@ -449,7 +449,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
- print ''."\n";
+ print ' '."\n";
print '';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
@@ -457,13 +457,13 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ' '."\n";
+ print ' '."\n";
print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
// Default
- print '';
+ print ' ';
if ($conf->global->COMMANDE_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@@ -491,12 +491,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf')
{
print ''.img_object($langs->trans("Preview"), 'bill').' ';
@@ -528,7 +528,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', '');
print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ''.$langs->trans("Value").' ';
print " \n";
print " \n";
@@ -580,7 +580,7 @@ Whet is definition of "shippable" according to all different STOCK_CALCULATE_...
print '';
print ''.$langs->trans("ShippableOrderIconInList").' ';
print ' ';
-print '';
+print ' ';
if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
print '';
print img_picto($langs->trans("Activated"),'switch_on');
@@ -598,7 +598,7 @@ if ($conf->banque->enabled)
{
print '';
- print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' ';
+ print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' ';
if (! empty($conf->use_javascript_ajax))
{
print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
@@ -620,7 +620,7 @@ else
{
print ' ';
- print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '.$langs->trans('NotAvailable').' '.$langs->trans('NotAvailable').' ';
}
// Ask for warehouse during order
@@ -628,7 +628,7 @@ if ($conf->stock->enabled)
{
print '';
- print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' ';
+ print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' ';
if (! empty($conf->use_javascript_ajax))
{
print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
@@ -650,7 +650,7 @@ else
{
print ' ';
- print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '.$langs->trans('NotAvailable').' '.$langs->trans('NotAvailable').' ';
}
*/
@@ -666,7 +666,7 @@ print load_fiche_titre($langs->trans("Notifications"), '', '');
print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ' ';
print " \n";
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 720b43a2275..062fcb1d998 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -190,7 +190,7 @@ print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Value").' ';
print ''.$langs->trans("Comment").' ';
if (! empty($conf->multicompany->enabled) && !$user->entity) print ''.$langs->trans("Entity").' ';
-print ''.$langs->trans("Action").' ';
+print ''.$langs->trans("Action").' ';
print "\n";
@@ -210,11 +210,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity)
print '';
print ' ';
- print '';
+ print ' ';
}
else
{
- print ' ';
+ print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
}
else
{
- print ' ';
+ print ' ';
print ' ';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("Status").' ';
-print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
print " \n";
clearstatcache();
@@ -249,7 +249,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print ''."\n";
- print '';
+ print ' ';
if ($conf->global->CONTRACT_ADDON == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir)
}
}
- print ' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
@@ -329,10 +329,10 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Status")." \n";
-print ''.$langs->trans("Default")." \n";
-print ''.$langs->trans("ShortInfo").' ';
-print ''.$langs->trans("Preview").' ';
+print ''.$langs->trans("Status")." \n";
+print ''.$langs->trans("Default")." \n";
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
print " \n";
clearstatcache();
@@ -384,7 +384,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
- print ''."\n";
+ print ' '."\n";
print '';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
@@ -392,13 +392,13 @@ foreach ($dirmodels as $reldir)
}
else
{
- print ' '."\n";
+ print ' '."\n";
print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
// Defaut
- print '';
+ print ' ';
if ($conf->global->CONTRACT_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@@ -424,12 +424,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf')
{
print ''.img_object($langs->trans("Preview"), 'contract').' ';
@@ -466,7 +466,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', '');
print '';
print '';
print ''.$langs->trans("Parameter").' ';
-print ''.$langs->trans("Value").' ';
+print ''.$langs->trans("Value").' ';
print " \n";
$substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index a946aeeacfd..c2559e0e2bf 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -322,11 +322,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity)
}
else
{
- print '';
+ print ' ';
print ' ';
}
-print '';
+print ' ';
$disabled='';
if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"';
print ' ';
+ print ' ';
if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
{
print ''.img_edit().' ';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 788f600a549..11134f70194 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -88,7 +88,7 @@ $hookmanager->initHooks(array('admin'));
// Put here declaration of dictionaries properties
// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,24,28,17,35,36,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,37,0,25,0);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,24,28,17,35,36,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,37,0,25,0);
// Name of SQL tables of dictionaries
$tabname=array();
@@ -1180,7 +1180,7 @@ if ($id)
}
if ($id == 4) print ' ';
+ print ' ';
if ($action != 'edit')
{
print '';
print '';
print ''.$langs->trans("Description").' ';
-print ' ';
-print ''.$langs->trans("Value").' '."\n";
+print ' ';
+print ''.$langs->trans("Value").' '."\n";
print ' ';
$form = new Form($db);
@@ -87,9 +87,9 @@ $form = new Form($db);
print '';
print ''.$langs->trans("ECMAutoTree").' ';
-print ' ';
+print ' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax)
{
print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 755d44d42ba..e8dbc07654c 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -412,7 +412,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
print ' '."\n";
@@ -450,10 +450,10 @@ while ($i < min($num, $limit))
$cssforfield='';
if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-
+
if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
-
+
if (! empty($arrayfields['t.'.$key]['checked']))
{
print 'executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index aa0dd0978d9..e284d4b4834 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -154,6 +154,13 @@ if ($mode == 'setup' && $user->admin)
$urltodelete='';
$urltocheckperms='';
}
+ elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+ {
+ $OAUTH_SERVICENAME='StripeLive';
+ $urltorenew=$urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+ $urltodelete='';
+ $urltocheckperms='';
+ }
else
{
$urltorenew='';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index f723d13d540..8b7c061dc64 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2019 Alexandre Spangaro
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -96,7 +97,7 @@ dol_fiche_head($head, 'setup', '', 0, 'user');
print '';
print '';
print "".$langs->trans("Other")." \n";
-print ''.$langs->trans("Status").' '."\n";
+print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UserWarehouseAutoCreate").' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_USERSTOCK_AUTOCREATE');
} else {
@@ -428,7 +428,7 @@ print ' ';
print '';
print $form->textwithpicto($langs->trans("StockSupportServices"), $langs->trans("StockSupportServicesDesc"));
print ' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_SUPPORTS_SERVICES');
} else {
@@ -440,7 +440,7 @@ print " \n";
print '';
print ''.$langs->trans("AllowAddLimitStockByWarehouse").' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE');
} else {
@@ -451,10 +451,9 @@ print " \n";
print " \n";
if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-
print '';
print ''.$langs->trans("UseDispatchStatus").' ';
- print '';
+ print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
} else {
diff --git a/htdocs/bom/admin/setup.php b/htdocs/bom/admin/setup.php
new file mode 100644
index 00000000000..dd16ad92b8e
--- /dev/null
+++ b/htdocs/bom/admin/setup.php
@@ -0,0 +1,146 @@
+
+ * Copyright (C) 2019 Maxime Kohlhaas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$langs->trans("BackToModuleList").' ';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_bom@bom');
+
+// Configuration header
+$head = bomAdminPrepareHead();
+dol_fiche_head($head, 'settings', '', -1, "bom@bom");
+
+// Setup page goes here
+echo $langs->trans("BomSetupPage").'';
+ print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
+ print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+ print ' ' . $conf->global->$key . '
';
+
+ print '';
+ }
+ else
+ {
+ print '' . $langs->trans("BackToList") . ' ';
+
+ $morehtmlref='';
+ /*
+ // Ref bis
+ $morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($user->rights->bom->write)
+ {
+ if ($action != 'classify')
+ $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref.=$proj->getNomUrl();
+ } else {
+ $morehtmlref.='';
+ }
+ }
+ }
+ */
+ $morehtmlref.='
';
+ print '
';
+ print '
';
+ print '
'."\n";
+
+ // Common attributes
+ //$keyforbreak='fieldkeytoswithonsecondcolumn';
+ include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+ // Other attributes
+ include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+ print '
';
+ print '
';
+ print '
';
+ print '
'; // ancre
+
+ // Documents
+ /*$objref = dol_sanitizeFileName($object->ref);
+ $relativepath = $comref . '/' . $comref . '.pdf';
+ $filedir = $conf->bom->dir_output . '/' . $objref;
+ $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+ $genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+ $delallowed = $user->rights->bom->create; // If you can create/edit, you can remove a file on card
+ print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+ */
+
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+ print '
';
+
+ $MAXEVENT = 10;
+
+ $morehtmlright = '
';
+ $morehtmlright.= $langs->trans("SeeAll");
+ $morehtmlright.= ' ';
+
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+
+ print '
' . $langs->trans("BackToList") . ' ';
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
+
+ print '
';
+ print '
';
+
+ // Number of files
+ print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
+
+ print '
' . $langs->trans("BackToList") . ' ';
+
+ $morehtmlref='';
+ /*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+ // Project
+ if (! empty($conf->projet->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='
'.$langs->trans('Project') . ' ';
+ if ($user->rights->bom->creer)
+ {
+ if ($action != 'classify')
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.=' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref.='
';
+ $morehtmlref.=$proj->ref;
+ $morehtmlref.=' ';
+ } else {
+ $morehtmlref.='';
+ }
+ }
+ }*/
+ $morehtmlref.='
';
+ print '
';
+
+
+ $cssclass="titlefield";
+ include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+ print '
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ' . $langs->trans("BillOfMaterials") . ' ';
+ $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+
+ $url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
+
+ if ($option != 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowBillOfMaterials");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+
+ /*
+ $hookmanager->initHooks(array('bomdao'));
+ $parameters=array('id'=>$this->id);
+ $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+ */
+ }
+ else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+ $linkstart = '';
+ $linkend=' ';
+
+ $result .= $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->ref;
+ $result .= $linkend;
+ //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+ global $action,$hookmanager;
+ $hookmanager->initHooks(array('bomdao'));
+ $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $result = $hookmanager->resPrint;
+ else $result .= $hookmanager->resPrint;
+
+ return $result;
+ }
+
+ /**
+ * Return label of the status
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function getLibStatut($mode = 0)
+ {
+ return $this->LibStatut($this->status, $mode);
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return the status
+ *
+ * @param int $status Id status
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function LibStatut($status, $mode = 0)
+ {
+ // phpcs:enable
+ if (empty($this->labelstatus))
+ {
+ global $langs;
+ //$langs->load("bom");
+ $this->labelstatus[1] = $langs->trans('Enabled');
+ $this->labelstatus[0] = $langs->trans('Disabled');
+ }
+
+ if ($mode == 0)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 1)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 2)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 3)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 4)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 5)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 6)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ }
+
+ /**
+ * Load the info information in the object
+ *
+ * @param int $id Id of object
+ * @return void
+ */
+ public function info($id)
+ {
+ $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+ $sql.= ' fk_user_creat, fk_user_modif';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+ $sql.= ' WHERE t.rowid = '.$id;
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $this->id = $obj->rowid;
+ if ($obj->fk_user_author)
+ {
+ $cuser = new User($this->db);
+ $cuser->fetch($obj->fk_user_author);
+ $this->user_creation = $cuser;
+ }
+
+ if ($obj->fk_user_valid)
+ {
+ $vuser = new User($this->db);
+ $vuser->fetch($obj->fk_user_valid);
+ $this->user_validation = $vuser;
+ }
+
+ if ($obj->fk_user_cloture)
+ {
+ $cluser = new User($this->db);
+ $cluser->fetch($obj->fk_user_cloture);
+ $this->user_cloture = $cluser;
+ }
+
+ $this->date_creation = $this->db->jdate($obj->datec);
+ $this->date_modification = $this->db->jdate($obj->datem);
+ $this->date_validation = $this->db->jdate($obj->datev);
+ }
+
+ $this->db->free($result);
+ }
+ else
+ {
+ dol_print_error($this->db);
+ }
+ }
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ public function initAsSpecimen()
+ {
+ $this->initAsSpecimenCommon();
+ }
+
+
+ /**
+ * Action executed by scheduler
+ * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+ *
+ * @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+ */
+ //public function doScheduledJob($param1, $param2, ...)
+ public function doScheduledJob()
+ {
+ global $conf, $langs;
+
+ //$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+ $error = 0;
+ $this->output = '';
+ $this->error='';
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $now = dol_now();
+
+ $this->db->begin();
+
+ // ...
+
+ $this->db->commit();
+
+ return $error;
+ }
+}
+
+
+/**
+ * Class for BillOfMaterialsLine
+ */
+class BillOfMaterialsLine extends CommonObject
+{
+ /**
+ * @var string ID to identify managed object
+ */
+ public $element = 'bomline';
+
+ /**
+ * @var string Name of table without prefix where object is stored
+ */
+ public $table_element = 'bom_bomline';
+
+ /**
+ * @var int Does bomline support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ */
+ public $ismultientitymanaged = 0;
+
+ /**
+ * @var int Does bomline support extrafields ? 0=No, 1=Yes
+ */
+ public $isextrafieldmanaged = 1;
+
+ /**
+ * @var string String with name of icon for bomline. Must be the part after the 'object_' into object_bomline.png
+ */
+ public $picto = 'bomline@bom';
+
+
+ /**
+ * 'type' if the field format.
+ * 'label' the translation key.
+ * 'enabled' is a condition when the field must be managed.
+ * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+ * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+ * 'default' is a default value for creation (can still be replaced by the global setup of default values)
+ * 'index' if we want an index in database.
+ * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+ * 'position' is the sort order of field.
+ * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+ * 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+ * 'css' is the CSS style to use on field. For example: 'maxwidth200'
+ * 'help' is a string visible as a tooltip on field
+ * 'comment' is not used. You can store here any text of your choice. It is not used by application.
+ * 'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+ * 'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+ */
+
+ // BEGIN MODULEBUILDER PROPERTIES
+ /**
+ * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ */
+ public $fields=array(
+ 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+ 'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
+ 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
+ 'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>-1, 'isameasure'=>'1',),
+ 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>-1, 'index'=>1,),
+ 'fk_bom' => array('type'=>'integer:BillOfMaterials:societe/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>-1, 'index'=>1,),
+ 'rank' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'position'=>40, 'notnull'=>1,),
+ );
+ public $rowid;
+ public $description;
+ public $import_key;
+ public $qty;
+ public $fk_product;
+ public $fk_bom;
+ public $rank;
+ // END MODULEBUILDER PROPERTIES
+
+
+
+ // If this object has a subtable with lines
+
+ /**
+ * @var int Name of subtable line
+ */
+ //public $table_element_line = 'bomlinedet';
+
+ /**
+ * @var int Field with ID of parent key if this field has a parent
+ */
+ //public $fk_element = 'fk_bomline';
+
+ /**
+ * @var int Name of subtable class that manage subtable lines
+ */
+ //public $class_element_line = 'BillOfMaterialsLineline';
+
+ /**
+ * @var array Array of child tables (child tables to delete before deleting a record)
+ */
+ //protected $childtables=array('bomlinedet');
+
+ /**
+ * @var BillOfMaterialsLineLine[] Array of subtable lines
+ */
+ //public $lines = array();
+
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDb $db Database handler
+ */
+ public function __construct(DoliDB $db)
+ {
+ global $conf, $langs, $user;
+
+ $this->db = $db;
+
+ if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
+ if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+
+ // Unset fields that are disabled
+ foreach($this->fields as $key => $val)
+ {
+ if (isset($val['enabled']) && empty($val['enabled']))
+ {
+ unset($this->fields[$key]);
+ }
+ }
+
+ // Translate some data of arrayofkeyval
+ foreach($this->fields as $key => $val)
+ {
+ if (is_array($this->fields['status']['arrayofkeyval']))
+ {
+ foreach($this->fields['status']['arrayofkeyval'] as $key2 => $val2)
+ {
+ $this->fields['status']['arrayofkeyval'][$key2]=$langs->trans($val2);
+ }
+ }
+ }
+ }
+
+ /**
+ * Create object into database
+ *
+ * @param User $user User that creates
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ * @return int <0 if KO, Id of created object if OK
+ */
+ public function create(User $user, $notrigger = false)
+ {
+ return $this->createCommon($user, $notrigger);
+ }
+
+ /**
+ * Clone an object into another one
+ *
+ * @param User $user User that creates
+ * @param int $fromid Id of object to clone
+ * @return mixed New object created, <0 if KO
+ */
+ public function createFromClone(User $user, $fromid)
+ {
+ global $langs, $hookmanager, $extrafields;
+ $error = 0;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $object = new self($this->db);
+
+ $this->db->begin();
+
+ // Load source object
+ $object->fetchCommon($fromid);
+ // Reset some properties
+ unset($object->id);
+ unset($object->fk_user_creat);
+ unset($object->import_key);
+
+ // Clear fields
+ $object->ref = "copy_of_".$object->ref;
+ $object->title = $langs->trans("CopyOf")." ".$object->title;
+ // ...
+ // Clear extrafields that are unique
+ if (is_array($object->array_options) && count($object->array_options) > 0)
+ {
+ $extrafields->fetch_name_optionals_label($this->element);
+ foreach($object->array_options as $key => $option)
+ {
+ $shortkey = preg_replace('/options_/', '', $key);
+ if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+ {
+ //var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+ unset($object->array_options[$key]);
+ }
+ }
+ }
+
+ // Create clone
+ $object->context['createfromclone'] = 'createfromclone';
+ $result = $object->createCommon($user);
+ if ($result < 0) {
+ $error++;
+ $this->error = $object->error;
+ $this->errors = $object->errors;
+ }
+
+ unset($object->context['createfromclone']);
+
+ // End
+ if (!$error) {
+ $this->db->commit();
+ return $object;
+ } else {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param int $id Id object
+ * @param string $ref Ref
+ * @return int <0 if KO, 0 if not found, >0 if OK
+ */
+ public function fetch($id, $ref = null)
+ {
+ $result = $this->fetchCommon($id, $ref);
+ if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+ return $result;
+ }
+
+ /**
+ * Load object lines in memory from the database
+ *
+ * @return int <0 if KO, 0 if not found, >0 if OK
+ */
+ /*public function fetchLines()
+ {
+ $this->lines=array();
+
+ // Load lines with object BillOfMaterialsLineLine
+
+ return count($this->lines)?1:0;
+ }*/
+
+ /**
+ * Load list of objects in memory from the database.
+ *
+ * @param string $sortorder Sort Order
+ * @param string $sortfield Sort field
+ * @param int $limit limit
+ * @param int $offset Offset
+ * @param array $filter Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+ * @param string $filtermode Filter mode (AND or OR)
+ * @return array|int int <0 if KO, array of pages if OK
+ */
+ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+ {
+ global $conf;
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $records=array();
+
+ $sql = 'SELECT';
+ $sql .= ' t.rowid';
+ // TODO Get all fields
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+ $sql .= ' WHERE t.entity = '.$conf->entity;
+ // Manage filter
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
+ if ($key=='t.rowid') {
+ $sqlwhere[] = $key . '='. $value;
+ }
+ elseif (strpos($key, 'date') !== false) {
+ $sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+ }
+ elseif ($key=='customsql') {
+ $sqlwhere[] = $value;
+ }
+ else {
+ $sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ }
+ }
+ }
+ if (count($sqlwhere) > 0) {
+ $sql .= ' AND (' . implode(' '.$filtermode.' ', $sqlwhere).')';
+ }
+
+ if (!empty($sortfield)) {
+ $sql .= $this->db->order($sortfield, $sortorder);
+ }
+ if (!empty($limit)) {
+ $sql .= ' ' . $this->db->plimit($limit, $offset);
+ }
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+
+ while ($obj = $this->db->fetch_object($resql))
+ {
+ $record = new self($this->db);
+
+ $record->id = $obj->rowid;
+ // TODO Get other fields
+
+ //var_dump($record->id);
+ $records[$record->id] = $record;
+ }
+ $this->db->free($resql);
+
+ return $records;
+ } else {
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+ return -1;
+ }
+ }
+
+ /**
+ * Update object into database
+ *
+ * @param User $user User that modifies
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ public function update(User $user, $notrigger = false)
+ {
+ return $this->updateCommon($user, $notrigger);
+ }
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @param bool $notrigger false=launch triggers after, true=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ public function delete(User $user, $notrigger = false)
+ {
+ return $this->deleteCommon($user, $notrigger);
+ //return $this->deleteCommon($user, $notrigger, 1);
+ }
+
+ /**
+ * Return a link to the object card (with optionaly the picto)
+ *
+ * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+ * @param string $option On what the link point to ('nolink', ...)
+ * @param int $notooltip 1=Disable tooltip
+ * @param string $morecss Add more css on link
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+ {
+ global $db, $conf, $langs, $hookmanager;
+ global $dolibarr_main_authentication, $dolibarr_main_demo;
+ global $menumanager;
+
+ if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
+
+ $result = '';
+
+ $label = '' . $langs->trans("BillOfMaterialsLine") . ' ';
+ $label.= '' . $langs->trans('Ref') . ': ' . $this->ref;
+
+ $url = dol_buildpath('/bom/bomline_card.php',1).'?id='.$this->id;
+
+ if ($option != 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowBillOfMaterialsLine");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+
+ /*
+ $hookmanager->initHooks(array('bomlinedao'));
+ $parameters=array('id'=>$this->id);
+ $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+ */
+ }
+ else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+ $linkstart = '';
+ $linkend=' ';
+
+ $result .= $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->ref;
+ $result .= $linkend;
+ //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+ global $action,$hookmanager;
+ $hookmanager->initHooks(array('bomlinedao'));
+ $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $result = $hookmanager->resPrint;
+ else $result .= $hookmanager->resPrint;
+
+ return $result;
+ }
+
+ /**
+ * Return label of the status
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function getLibStatut($mode = 0)
+ {
+ return $this->LibStatut($this->status, $mode);
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return the status
+ *
+ * @param int $status Id status
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function LibStatut($status, $mode = 0)
+ {
+ // phpcs:enable
+ if (empty($this->labelstatus))
+ {
+ global $langs;
+ //$langs->load("bom");
+ $this->labelstatus[1] = $langs->trans('Enabled');
+ $this->labelstatus[0] = $langs->trans('Disabled');
+ }
+
+ if ($mode == 0)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 1)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 2)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 3)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 4)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 5)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 6)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5', '', false, 0, 0, '', 'valignmiddle');
+ }
+ }
+
+ /**
+ * Load the info information in the object
+ *
+ * @param int $id Id of object
+ * @return void
+ */
+ public function info($id)
+ {
+ $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+ $sql.= ' fk_user_creat, fk_user_modif';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+ $sql.= ' WHERE t.rowid = '.$id;
+ $result=$this->db->query($sql);
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $this->id = $obj->rowid;
+ if ($obj->fk_user_author)
+ {
+ $cuser = new User($this->db);
+ $cuser->fetch($obj->fk_user_author);
+ $this->user_creation = $cuser;
+ }
+
+ if ($obj->fk_user_valid)
+ {
+ $vuser = new User($this->db);
+ $vuser->fetch($obj->fk_user_valid);
+ $this->user_validation = $vuser;
+ }
+
+ if ($obj->fk_user_cloture)
+ {
+ $cluser = new User($this->db);
+ $cluser->fetch($obj->fk_user_cloture);
+ $this->user_cloture = $cluser;
+ }
+
+ $this->date_creation = $this->db->jdate($obj->datec);
+ $this->date_modification = $this->db->jdate($obj->datem);
+ $this->date_validation = $this->db->jdate($obj->datev);
+ }
+
+ $this->db->free($result);
+ }
+ else
+ {
+ dol_print_error($this->db);
+ }
+ }
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ public function initAsSpecimen()
+ {
+ $this->initAsSpecimenCommon();
+ }
+
+
+ /**
+ * Action executed by scheduler
+ * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+ *
+ * @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+ */
+ //public function doScheduledJob($param1, $param2, ...)
+ public function doScheduledJob()
+ {
+ global $conf, $langs;
+
+ //$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+ $error = 0;
+ $this->output = '';
+ $this->error='';
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $now = dol_now();
+
+ $this->db->begin();
+
+ // ...
+
+ $this->db->commit();
+
+ return $error;
+ }
+}
+
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
new file mode 100644
index 00000000000..ee93c6525f8
--- /dev/null
+++ b/htdocs/bom/lib/bom.lib.php
@@ -0,0 +1,124 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$nbNote.' ';
+ $head[$h][2] = 'note';
+ $h++;
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+ $upload_dir = $conf->bom->dir_output . "/bom/" . dol_sanitizeFileName($object->ref);
+ $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+ $nbLinks=Link::count($db, $object->element, $object->id);
+ $head[$h][0] = dol_buildpath("/bom/bom_document.php", 1).'?id='.$object->id;
+ $head[$h][1] = $langs->trans('Documents');
+ if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' '.($nbFiles+$nbLinks).' ';
+ $head[$h][2] = 'document';
+ $h++;
+
+ $head[$h][0] = dol_buildpath("/bom/bom_agenda.php", 1).'?id='.$object->id;
+ $head[$h][1] = $langs->trans("Events");
+ $head[$h][2] = 'agenda';
+ $h++;
+
+ // Show more tabs from modules
+ // Entries must be declared in modules descriptor with line
+ //$this->tabs = array(
+ // 'entity:+tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+ //); // to add new tab
+ //$this->tabs = array(
+ // 'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+ //); // to remove a tab
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom@bom');
+
+ return $head;
+}
\ No newline at end of file
diff --git a/htdocs/bom/modulebuilder.txt b/htdocs/bom/modulebuilder.txt
new file mode 100644
index 00000000000..24ea0d6eac5
--- /dev/null
+++ b/htdocs/bom/modulebuilder.txt
@@ -0,0 +1,3 @@
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. Use ModuleBuilder if you want to delete module.
\ No newline at end of file
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 3c455f102f9..a7aab12b2ef 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$action = GETPOST('action', 'alpha');
$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-unset ($_SESSION['serObjFacturation']);
+unset($_SESSION['serObjFacturation']);
switch($action)
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index b75878b11bd..9d47c63a75a 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -359,7 +359,7 @@ switch ($action)
// End of case: valide_facture
}
-unset ($_SESSION['serObjFacturation']);
+unset($_SESSION['serObjFacturation']);
$_SESSION['serObjFacturation'] = serialize($obj_facturation);
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index f5b13437ba9..2b670ae5286 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -220,7 +220,7 @@ class Categories extends DolibarrApi
if ($this->category->update(DolibarrApiAccess::$user) > 0)
{
- return $this->get ($id);
+ return $this->get($id);
}
else
{
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 20d9a862f33..99433a9b8f0 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1472,8 +1472,7 @@ class Categorie extends CommonObject
// We want to reverse lookup
$map_type = array_flip($this->MAP_ID);
$type = $map_type[$type];
-dol_syslog( get_class($this) . "::rechercher(): numeric types are deprecated, please use string instead",
- LOG_WARNING );
+ dol_syslog(get_class($this) . "::rechercher(): numeric types are deprecated, please use string instead", LOG_WARNING);
}
// Generation requete recherche
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 596cc20c9e0..b542cf4dd67 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -895,7 +895,7 @@ if ($action == 'create')
$numproject=$formproject->select_projects((! empty($societe->id)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
- print ' '.$langs->trans("AddProject").' ';
+ print ' '.$langs->trans("AddProject").' ';
$urloption='?action=create';
$url = dol_buildpath('comm/action/card.php', 2).$urloption;
@@ -1293,7 +1293,7 @@ if ($id > 0)
$numprojet=$formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0);
if ($numprojet==0)
{
- print ' '.$langs->trans("AddProject").' ';
+ print ' '.$langs->trans("AddProject").' ';
}
print ' ';
}
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 00aae3a8b08..567f968e3d2 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -423,12 +423,15 @@ class AdvanceTargetingMailing extends CommonObject
$this->db->begin();
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ if (! $resql) {
+ $error++;
+ $this->errors[]="Error ".$this->db->lasterror();
+ }
- if (! $error)
- {
- if (! $notrigger)
- {
+ //if (! $error)
+ //{
+ // if (! $notrigger)
+ // {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -438,8 +441,8 @@ class AdvanceTargetingMailing extends CommonObject
//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
//if ($result < 0) { $error++; $this->errors=$interface->errors; }
//// End call triggers
- }
- }
+ // }
+ //}
// Commit or rollback
if ($error)
@@ -790,15 +793,15 @@ class AdvanceTargetingMailing extends CommonObject
if (!empty($arrayquery['options_'.$key.'_end_dt'.'_cnct'])){
$sqlwhere[]= " (te.".$key." >= '".$this->db->idate($arrayquery['options_'.$key.'_st_dt'.'_cnct'])."' AND te.".$key." <= '".$this->db->idate($arrayquery['options_'.$key.'_end_dt'.'_cnct'])."')";
}
- }elseif ($extrafields->attribute_type[$key] == 'boolean') {
+ } elseif ($extrafields->attribute_type[$key] == 'boolean') {
if ($arrayquery['options_'.$key.'_cnct']!=''){
if ($arrayquery['options_'.$key.'_cnct']==0) {
$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key.'_cnct']." OR ((te.".$key." IS NULL) AND (te.fk_object IS NOT NULL)))";
- }else {
+ } else {
$sqlwhere[]= " (te.".$key." = ".$arrayquery['options_'.$key.'_cnct'].")";
}
}
- }else{
+ } else {
if (is_array($arrayquery['options_'.$key.'_cnct'])) {
$sqlwhere[]= " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key.'_cnct'])."'))";
} elseif (!empty($arrayquery['options_'.$key.'_cnct'])) {
@@ -965,12 +968,12 @@ class AdvanceTargetingMailing extends CommonObject
}
if (count($return_sql_like)>0) {
- $return_sql_criteria .= '(' . implode (' OR ', $return_sql_like) .')';
+ $return_sql_criteria .= '(' . implode(' OR ', $return_sql_like) .')';
}
if (count($return_sql_not_like)>0) {
- $return_sql_criteria .= ' AND (' . implode (' AND ', $return_sql_not_like).')';
+ $return_sql_criteria .= ' AND (' . implode(' AND ', $return_sql_not_like).')';
}
- }else {
+ } else {
$return_sql_criteria .= $column_to_test . ' LIKE \''.$this->db->escape($criteria).'\'';
}
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 26b16e50d68..66303647dbc 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -1,5 +1,6 @@
+/* Copyright (C) 2014 Florian Henry
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,10 +44,10 @@ class FormAdvTargetEmailing extends Form
*/
function __construct($db)
{
- global $langs;
+ global $langs;
- $this->db = $db;
- }
+ $this->db = $db;
+ }
/**
* Affiche un champs select contenant une liste
@@ -64,7 +65,7 @@ class FormAdvTargetEmailing extends Form
$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
$sql .= " WHERE active > 0";
$sql .= " ORDER BY sortorder";
- dol_syslog (get_class($this) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
@@ -83,7 +84,7 @@ class FormAdvTargetEmailing extends Form
dol_print_error($this->db);
}
return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
- }
+ }
/**
* Return combo list of activated countries, into language of user
@@ -120,10 +121,10 @@ class FormAdvTargetEmailing extends Form
$foundselected = false;
while ($i < $num) {
- $obj = $this->db->fetch_object ($resql);
+ $obj = $this->db->fetch_object($resql);
$countryArray [$i] ['rowid'] = $obj->rowid;
$countryArray [$i] ['code_iso'] = $obj->code_iso;
- $countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
+ $countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
$label[$i] = $countryArray[$i]['label'];
$i ++;
}
@@ -143,7 +144,7 @@ class FormAdvTargetEmailing extends Form
}
return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
- }
+ }
/**
* Return select list for categories (to use in form search selectors)
@@ -166,26 +167,26 @@ class FormAdvTargetEmailing extends Form
$sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
$sql_usr .= " AND u2.rowid = sc.fk_user ";
- if (! empty ($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
+ if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
$sql_usr .= " AND u2.statut<>0 ";
$sql_usr .= " ORDER BY name ASC";
// print $sql_usr;exit;
- $resql_usr = $this->db->query ($sql_usr);
+ $resql_usr = $this->db->query($sql_usr);
if ($resql_usr) {
- while ( $obj_usr = $this->db->fetch_object ($resql_usr) ) {
+ while ( $obj_usr = $this->db->fetch_object($resql_usr) ) {
$label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
$options_array [$obj_usr->rowid] = $label;
}
- $this->db->free ($resql_usr);
+ $this->db->free($resql_usr);
} else {
- dol_print_error ($this->db);
+ dol_print_error($this->db);
}
- return $this->advMultiselectarray ($htmlname, $options_array, $selected_array);
- }
+ return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
+ }
/**
* Return select list for categories (to use in form search selectors)
@@ -210,7 +211,7 @@ class FormAdvTargetEmailing extends Form
}
asort($options_array);
return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
- }
+ }
/**
* Return multiselect list of entities for extrafeild type sellist
@@ -227,8 +228,8 @@ class FormAdvTargetEmailing extends Form
if (is_array($sqlqueryparam))
{
- $param_list = array_keys ($sqlqueryparam);
- $InfoFieldList = explode (":", $param_list [0]);
+ $param_list = array_keys($sqlqueryparam);
+ $InfoFieldList = explode(":", $param_list [0]);
// 0 1 : tableName
// 1 2 : label field name Nom du champ contenant le libelle
@@ -237,8 +238,8 @@ class FormAdvTargetEmailing extends Form
$keyList = 'rowid';
- if (count ($InfoFieldList) >= 3) {
- if (strpos ($InfoFieldList [3], 'extra.') !== false) {
+ if (count($InfoFieldList) >= 3) {
+ if (strpos($InfoFieldList [3], 'extra.') !== false) {
$keyList = 'main.' . $InfoFieldList [2] . ' as rowid';
} else {
$keyList = $InfoFieldList [2] . ' as rowid';
@@ -247,10 +248,10 @@ class FormAdvTargetEmailing extends Form
$sql = 'SELECT ' . $keyList . ', ' . $InfoFieldList [1];
$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList [0];
- if (! empty ($InfoFieldList [3])) {
+ if (! empty($InfoFieldList [3])) {
// We have to join on extrafield table
- if (strpos ($InfoFieldList [3], 'extra') !== false) {
+ if (strpos($InfoFieldList [3], 'extra') !== false) {
$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList [0] . '_extrafields as extra';
$sql .= ' WHERE extra.fk_object=main.' . $InfoFieldList [2] . ' AND ' . $InfoFieldList [3];
} else {
@@ -270,13 +271,13 @@ class FormAdvTargetEmailing extends Form
$i = 0;
if ($num) {
while ( $i < $num ) {
- $obj = $this->db->fetch_object ($resql);
- $labeltoshow = dol_trunc ($obj->$InfoFieldList [1], 90);
+ $obj = $this->db->fetch_object($resql);
+ $labeltoshow = dol_trunc($obj->$InfoFieldList [1], 90);
$options_array[$obj->rowid]=$labeltoshow;
$i ++;
}
}
- $this->db->free ($resql);
+ $this->db->free($resql);
}
}
@@ -328,7 +329,7 @@ class FormAdvTargetEmailing extends Form
dol_print_error($this->db);
}
- return $this->advMultiselectarray ($htmlname, $options_array, $selected_array);
+ return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
}
/**
@@ -347,7 +348,7 @@ class FormAdvTargetEmailing extends Form
$form=new Form($this->db);
$return = $form->multiselectarray($htmlname, $options_array, $selected_array, 0, 0, '', 0, 295);
return $return;
- }
+ }
/**
* Return combo list with customer categories
@@ -438,19 +439,19 @@ class FormAdvTargetEmailing extends Form
$sql .= " WHERE type_element='$type_element'";
$sql .= " ORDER BY c.name";
- dol_syslog (get_class ($this) . "::".__METHOD__, LOG_DEBUG);
- $resql = $this->db->query ($sql);
+ dol_syslog(get_class($this) . "::".__METHOD__, LOG_DEBUG);
+ $resql = $this->db->query($sql);
if ($resql) {
$out .= '';
if ($showempty)
$out .= ' ';
} else {
- dol_print_error ($this->db);
+ dol_print_error($this->db);
}
- $this->db->free ($resql);
+ $this->db->free($resql);
return $out;
- }
+ }
}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ac64f65381c..46bc16dfa8c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1590,7 +1590,7 @@ if ($action == 'create')
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print '';
}
print '' . "\n";
@@ -1677,7 +1677,7 @@ if ($action == 'create')
print '';
print '' . $langs->trans("Project") . ' ';
$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print ' ';
}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 37408d02057..0d49e938c54 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004-2019 Laurent Destailleur
* Copyright (C) 2008 Raphael Bertrand (Resultic)
*
* This program is free software; you can redistribute it and/or modify
@@ -411,7 +411,7 @@ if ($socid > 0)
print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
}
- $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+ $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description,";
$sql.= " rc.fk_facture_source,";
$sql.= " u.login, u.rowid as user_id,";
@@ -433,11 +433,19 @@ if ($socid > 0)
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
- print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("VATRate").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DiscountOfferedBy").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("AmountHT").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountHT").' ';
+ }
+ print ''.$langs->trans("VATRate").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountTTC").' ';
+ }
+ print ''.$langs->trans("DiscountOfferedBy").' ';
print ' ';
print ' ';
@@ -455,7 +463,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc), 'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
{
- print '';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -464,7 +472,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -473,7 +481,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -482,14 +490,22 @@ if ($socid > 0)
}
else
{
- print ' ';
+ print ' ';
print $obj->description;
print ' ';
}
print ''.$langs->trans("NotConsumed").' ';
print ''.price($obj->amount_ht).' ';
- print ''.price2num($obj->tva_tx, 'MU').'% ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ht).' ';
+ }
+ print ''.vatrate($obj->tva_tx, true).' ';
print ''.price($obj->amount_ttc).' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ttc).' ';
+ }
print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.' ';
print ' ';
@@ -497,7 +513,7 @@ if ($socid > 0)
{
print '';
print 'rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_split($langs->trans("SplitDiscount")).' ';
- print ' ';
+ //print ' ';
print 'rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_delete($langs->trans("RemoveDiscount")).' ';
print ' ';
}
@@ -550,7 +566,7 @@ if ($socid > 0)
/*
* Liste remises fixes fournisseur restant en cours (= liees a aucune facture ni ligne de facture)
*/
- $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+ $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description,";
$sql.= " rc.fk_invoice_supplier_source,";
$sql.= " u.login, u.rowid as user_id,";
@@ -572,11 +588,19 @@ if ($socid > 0)
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
- print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("VATRate").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DiscountOfferedBy").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("AmountHT").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountHT").' ';
+ }
+ print ''.$langs->trans("VATRate").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountTTC").' ';
+ }
+ print ''.$langs->trans("DiscountOfferedBy").' ';
print ' ';
print ' ';
@@ -594,7 +618,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc), 'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
{
- print '';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -603,7 +627,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -612,7 +636,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -621,22 +645,30 @@ if ($socid > 0)
}
else
{
- print ' ';
+ print ' ';
print $obj->description;
print ' ';
}
print ''.$langs->trans("NotConsumed").' ';
print ''.price($obj->amount_ht).' ';
- print ''.price2num($obj->tva_tx, 'MU').'% ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ht).' ';
+ }
+ print ''.vatrate($obj->tva_tx, true).' ';
print ''.price($obj->amount_ttc).' ';
- print '';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ' '.price($obj->multicurrency_amount_ttc).' ';
+ }
+ print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.' ';
print ' ';
if ($user->rights->societe->creer || $user->rights->facture->creer)
{
- print '';
+ print ' ';
print 'rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_split($langs->trans("SplitDiscount")).' ';
- print ' ';
+ //print ' ';
print 'rowid.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.img_delete($langs->trans("RemoveDiscount")).' ';
print ' ';
}
@@ -700,7 +732,7 @@ if ($socid > 0)
}
// Remises liees a lignes de factures
- $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+ $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
$sql.= " rc.fk_facture_source,";
$sql.= " u.login, u.rowid as user_id,";
@@ -745,11 +777,19 @@ if ($socid > 0)
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
- print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("VATRate").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("Author").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("AmountHT").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountHT").' ';
+ }
+ print ''.$langs->trans("VATRate").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountTTC").' ';
+ }
+ print ''.$langs->trans("Author").' ';
print ' ';
print ' ';
@@ -788,7 +828,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc), 'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
{
- print '';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -797,7 +837,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -806,7 +846,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -815,15 +855,23 @@ if ($socid > 0)
}
else
{
- print ' ';
+ print ' ';
print $obj->description;
print ' ';
}
- print ''.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.' '.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.' '.price($obj->amount_ht).' ';
- print ''.price2num($obj->tva_tx, 'MU').'% ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ht).' ';
+ }
+ print ''.vatrate($obj->tva_tx, true).' ';
print ''.price($obj->amount_ttc).' ';
- print '';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ' '.price($obj->multicurrency_amount_ttc).' ';
+ }
+ print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.' ';
print ' ';
print ' ';
@@ -854,7 +902,7 @@ if ($socid > 0)
}
// Remises liees a lignes de factures
- $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+ $sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
$sql.= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
$sql.= " rc.fk_invoice_supplier_source,";
$sql.= " u.login, u.rowid as user_id,";
@@ -899,11 +947,19 @@ if ($socid > 0)
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
- print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("VATRate").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("Author").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("AmountHT").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountHT").' ';
+ }
+ print ''.$langs->trans("VATRate").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.$langs->trans("MulticurrencyAmountTTC").' ';
+ }
+ print ''.$langs->trans("Author").' ';
print ' ';
print ' ';
@@ -942,7 +998,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc), 'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
{
- print '';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -951,7 +1007,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -960,7 +1016,7 @@ if ($socid > 0)
}
elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
{
- print ' ';
+ print ' ';
$facturefournstatic->id=$obj->fk_invoice_supplier_source;
$facturefournstatic->ref=$obj->ref;
$facturefournstatic->type=$obj->type;
@@ -969,14 +1025,22 @@ if ($socid > 0)
}
else
{
- print ' ';
+ print ' ';
print $obj->description;
print ' ';
}
- print ''.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.' '.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.' '.price($obj->amount_ht).' ';
- print ''.price2num($obj->tva_tx, 'MU').'% ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ht).' ';
+ }
+ print ''.vatrate($obj->tva_tx, true).' ';
print ''.price($obj->amount_ttc).' ';
+ if (! empty($conf->multicurrency->enabled))
+ {
+ print ''.price($obj->multicurrency_amount_ttc).' ';
+ }
print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.' ';
print ' ';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 45c10a3aedd..6afee20b371 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1636,7 +1636,7 @@ if ($action == 'create' && $user->rights->commande->creer)
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print '';
}
print '' . "\n";
@@ -1727,7 +1727,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '' . $langs->trans("Project") . ' ';
$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print ' ';
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8272b2534bf..26151fd8b72 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -203,7 +203,12 @@ class Commande extends CommonOrder
public $multicurrency_total_ttc;
public $oldcopy;
-
+
+ //! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
+ public $module_source;
+ //! key of pos source ('0', '1', ...)
+ public $pos_source;
+
/**
* ERR Not enough stock
*/
@@ -820,7 +825,7 @@ class Commande extends CommonOrder
$sql.= ", fk_warehouse";
$sql.= ", remise_absolue, remise_percent";
$sql.= ", fk_incoterms, location_incoterms";
- $sql.= ", entity";
+ $sql.= ", entity, module_source, pos_source";
$sql.= ", fk_multicurrency";
$sql.= ", multicurrency_code";
$sql.= ", multicurrency_tx";
@@ -849,6 +854,8 @@ class Commande extends CommonOrder
$sql.= ", ".(int) $this->fk_incoterms;
$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
$sql.= ", ".$conf->entity;
+ $sql.= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
+ $sql.= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
$sql.= ", ".(int) $this->fk_multicurrency;
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".(double) $this->multicurrency_tx;
@@ -1633,7 +1640,8 @@ class Commande extends CommonOrder
$sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.last_main_doc, c.fk_delivery_address, c.extraparams';
$sql.= ', c.fk_incoterms, c.location_incoterms';
$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
- $sql.= ", i.libelle as libelle_incoterms";
+ $sql.= ", c.module_source, c.pos_source";
+ $sql.= ", i.libelle as libelle_incoterms";
$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
$sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
$sql.= ', ca.code as availability_code, ca.label as availability_label';
@@ -1680,7 +1688,7 @@ class Commande extends CommonOrder
$this->date_commande = $this->db->jdate($obj->date_commande);
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_validation = $this->db->jdate($obj->date_valid);
- $this->date_modification = $this->db->jdate($obj->tms);
+ $this->date_modification = $this->db->jdate($obj->tms);
$this->remise = $obj->remise;
$this->remise_percent = $obj->remise_percent;
$this->remise_absolue = $obj->remise_absolue;
@@ -1707,13 +1715,15 @@ class Commande extends CommonOrder
$this->demand_reason_code = $obj->demand_reason_code;
$this->date_livraison = $this->db->jdate($obj->date_livraison);
$this->shipping_method_id = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
- $this->warehouse_id = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
+ $this->warehouse_id = ($obj->fk_warehouse>0)?$obj->fk_warehouse:null;
$this->fk_delivery_address = $obj->fk_delivery_address;
-
+ $this->module_source = $obj->module_source;
+ $this->pos_source = $obj->pos_source;
+
//Incoterms
- $this->fk_incoterms = $obj->fk_incoterms;
- $this->location_incoterms = $obj->location_incoterms;
- $this->libelle_incoterms = $obj->libelle_incoterms;
+ $this->fk_incoterms = $obj->fk_incoterms;
+ $this->location_incoterms = $obj->location_incoterms;
+ $this->libelle_incoterms = $obj->libelle_incoterms;
// Multicurrency
$this->fk_multicurrency = $obj->fk_multicurrency;
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 19ad1dbe2c2..f525a7b7d88 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -106,7 +106,7 @@ if ($action != 'edit')
print '';
print ' ';
}
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index b22531a9573..cf355beeb77 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -832,12 +832,12 @@ if ($mode == 'standard')
$link="".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"')." ";
print ''.$link.' ';
+ print ' ';
$file = "movement".$account."-".$year.$month.".png";
print $show4;
print ' ';
+ print ' ';
print $show1;
print ' ".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")." ".img_next('', 'class="valignbottom"')." ";
print ''.$link.' ';
+ print ' ';
print $show5;
print ' ';
+ print ' ';
print $show2;
print ' ';
+ print ' ';
print $show3;
print ' ';
+print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print ' ';
@@ -383,19 +383,19 @@ if (! empty($arrayfields['accountype']['checked'])) print_liste_field_titr
if (! empty($arrayfields['b.number']['checked'])) print_liste_field_titre($arrayfields['b.number']['label'], $_SERVER["PHP_SELF"], 'b.number', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'], $_SERVER["PHP_SELF"], 'b.account_number', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'], $_SERVER["PHP_SELF"], 'b.fk_accountancy_journal', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (! empty($arrayfields['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
@@ -492,7 +492,7 @@ foreach ($accounts as $key=>$type)
// Currency
if (! empty($arrayfields['b.currency_code']['checked']))
{
- print '';
+ print ' ';
print $obj->currency_code;
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -501,7 +501,7 @@ foreach ($accounts as $key=>$type)
// Transactions to reconcile
if (! empty($arrayfields['toreconcile']['checked']))
{
- print '';
+ print ' ';
if ($obj->rappro)
{
$result=$obj->load_board($user, $obj->id);
@@ -526,7 +526,7 @@ foreach ($accounts as $key=>$type)
// Date creation
if (! empty($arrayfields['b.datec']['checked']))
{
- print ' ';
+ print ' ';
print dol_print_date($obj->date_creation, 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -534,7 +534,7 @@ foreach ($accounts as $key=>$type)
// Date modification
if (! empty($arrayfields['b.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($obj->date_update, 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -543,7 +543,7 @@ foreach ($accounts as $key=>$type)
// Status
if (! empty($arrayfields['b.clos']['checked']))
{
- print ''.$obj->getLibStatut(5).' ';
+ print ''.$obj->getLibStatut(5).' ';
if (! $i) $totalarray['nbfield']++;
}
@@ -559,7 +559,7 @@ foreach ($accounts as $key=>$type)
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 6c6a8447c5a..ac4d17e4c49 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -496,7 +496,7 @@ if (empty($numref))
}
print ' '.price(($balancestart[$objp->numr]+$content[$objp->numr]), '', $langs, 1, -1, -1, $conf->currency).' ';
- print '';
+ print ' ';
if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
print 'numr.'">'.img_edit().' ';
}
@@ -540,10 +540,10 @@ else
print '';
- print '
';
+ print '';
print '';
- print ''.$langs->trans("DateOperationShort").' ';
- print ''.$langs->trans("DateValueShort").' ';
+ print ''.$langs->trans("DateOperationShort").' ';
+ print ''.$langs->trans("DateValueShort").' ';
print ''.$langs->trans("Type").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Debit").' ';
@@ -589,10 +589,10 @@ else
print ' ';
// Date operation
- print ''.dol_print_date($db->jdate($objp->do), "day").' ';
+ print ''.dol_print_date($db->jdate($objp->do), "day").' ';
// Date de valeur
- print '';
+ print ' ';
print dol_print_date($db->jdate($objp->dv), "day") .' ';
print '';
print img_edit_remove() . " ";
@@ -778,13 +778,13 @@ else
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
- print ' ';
+ print ' ';
print img_edit();
print " ";
+ print " ";
}
print " ";
$i++;
@@ -793,11 +793,11 @@ else
}
// Line Total
- print "\n".''.$langs->trans("Total")." : ".price($totald)." ".price($totalc)." '.$langs->trans("Total")." : ".price($totald)." ".price($totalc)." ";
- print " ".$langs->trans("EndBankBalance")." : ".$langs->trans("EndBankBalance")." : '.price(price2num($total, 'MT'))." ";
print " \n";
print "
";
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 2d81facbad2..b3624e274f2 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -180,7 +180,7 @@ if ($result)
print '';
// Ref
- print '';
+ print ' ';
print ' ';
@@ -195,7 +195,7 @@ if ($result)
print '';
// Type
- print '';
+ print ' ';
$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
print ' ';
@@ -233,13 +233,13 @@ if ($result)
print ' ';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "v.rowid", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "v.label", "", $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "v.datep", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'align="left"', $sortfield, $sortorder);
+ print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "v.label", "", $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "v.datep", "", $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
if (! empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
- if (! empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print " \n";
@@ -300,7 +300,7 @@ if ($result)
}
// Debit
- print "";
+ print " ";
if ($obj->sens == 0)
{
print price($obj->amount);
@@ -309,7 +309,7 @@ if ($result)
print " ";
// Credit
- print "";
+ print " ";
if ($obj->sens == 1)
{
print price($obj->amount);
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 06e818db0a3..36cc40c851c 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -146,28 +146,28 @@ if ($resql)
print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder);
print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "s.town", "", "", 'valign="center"', $sortfield, $sortorder);
- print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "", 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("AccountancyCode", $_SERVER["PHP_SELF"], "s.code_compta", "", "", 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "datec", $addu, "", 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "", '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("AccountancyCode", $_SERVER["PHP_SELF"], "s.code_compta", "", "", '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "datec", $addu, "", '', $sortfield, $sortorder, 'right ');
print "\n";
// Lignes des champs de filtre
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
print " \n";
@@ -186,7 +186,7 @@ if ($resql)
print ''.$obj->town.' ';
print ''.$obj->code_client.' ';
print ''.$obj->code_compta.' ';
- print ''.dol_print_date($db->jdate($obj->datec)).' ';
+ print ''.dol_print_date($db->jdate($obj->datec)).' ';
print "\n";
$i++;
}
diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/compta-files.php
index 920037a5de1..3917cad6133 100644
--- a/htdocs/compta/compta-files.php
+++ b/htdocs/compta/compta-files.php
@@ -283,7 +283,7 @@ llxHeader('', $title, $help_url);
$h=0;
$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-$head[$h][1] = $langs->trans("AccountancyFiles");
+$head[$h][1] = $langs->trans("AccountantFiles");
$head[$h][2] = 'AccountancyFiles';
dol_fiche_head($head, 'AccountancyFiles');
@@ -374,9 +374,9 @@ if (!empty($date_start) && !empty($date_stop))
print ''.$langs->trans("Ref").' ';
print ''.$langs->trans("Link").' ';
print ''.$langs->trans("Paid").' ';
- print ''.$langs->trans("Debit").' ';
- print ''.$langs->trans("Credit").' ';
- print ''.$langs->trans("Balance").' ';
+ print ''.$langs->trans("Debit").' ';
+ print ''.$langs->trans("Credit").' ';
+ print ''.$langs->trans("Balance").' ';
print '';
if ($result)
{
@@ -421,21 +421,21 @@ if (!empty($date_start) && !empty($date_stop))
// File link
print '".$data['name']." '.$data['paid'].' ';
- print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." \n";
+ print ''.$data['paid'].' ';
+ print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." \n";
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
- print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." \n";
+ print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." \n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
// Balance
- print ''.price($data['balance'])." \n";
+ print ''.price($data['balance'])." \n";
print "\n";
}
print '';
print ' ';
- print ''.price($totalDebit).' ';
- print ''.price($totalCredit).' ';
- print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' ';
+ print ''.price($totalDebit).' ';
+ print ''.price($totalCredit).' ';
+ print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' ';
print " \n";
}
}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 80951464d7b..e3e67f23585 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -696,6 +696,7 @@ if (empty($reshook))
$db->begin();
$amount_ht = $amount_tva = $amount_ttc = array();
+ $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
// Loop on each vat rate
$i = 0;
@@ -709,7 +710,7 @@ if (empty($reshook))
$multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
$multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
$multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
- $i ++;
+ $i++;
}
}
@@ -2695,7 +2696,7 @@ if ($action == 'create')
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print '';
}
print '' . "\n";
@@ -3091,7 +3092,7 @@ if ($action == 'create')
$langs->load('projects');
print '' . $langs->trans('Project') . ' ';
$numprojet = $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1);
- print ' id.($fac_rec?'&fac_rec='.$fac_rec:'')).'">' . $langs->trans("AddProject") . ' ';
+ print ' id.($fac_rec?'&fac_rec='.$fac_rec:'')).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print $companystatic->getNomUrl(1, 'customer', 16);
print ' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
print '';
$tot_ttc+=$obj->total_ttc;
$i++;
}
print ''.$langs->trans("Total").' ';
- print ''.price($tot_ttc).' ';
+ print ''.price($tot_ttc).' ';
print '';
print $companystatic->getNomUrl(1, 'supplier', 16);
print ' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
print '';
$tot_ttc+=$obj->total_ttc;
$i++;
}
print ''.$langs->trans("Total").' ';
- print ''.price($tot_ttc).' ';
+ print ''.price($tot_ttc).' ';
print '';
print ''.$langs->trans("BoxTitleLastCustomerBills", $max).' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DateModificationShort").' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("DateModificationShort").' ';
print ' ';
print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$obj->rowid;
@@ -409,9 +409,9 @@ 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).' ';
- print ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
+ 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 '';
@@ -474,9 +474,9 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print '';
print ''.$langs->trans("BoxTitleLastSupplierBills", $max).' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DateModificationShort").' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("DateModificationShort").' ';
print ' ';
print "';
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 ''.dol_print_date($db->jdate($obj->tms), 'day').' ';
+ 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).' ';
print '';
$total += $obj->total_ht;
@@ -565,8 +565,8 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
print '';
print ''.$langs->trans("BoxTitleLastModifiedDonations", $max).' ';
print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("DateModificationShort").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("DateModificationShort").' ';
print ' ';
print ' ';
if ($num)
@@ -588,8 +588,8 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
print '';
print ''.$donationstatic->getNomUrl(1).' ';
print ''.$label.' ';
- print ''.price($objp->amount).' ';
- print ''.dol_print_date($db->jdate($objp->dm), 'day').' ';
+ print ''.price($objp->amount).' ';
+ print ''.dol_print_date($db->jdate($objp->dm), 'day').' ';
print ''.$donationstatic->LibStatut($objp->fk_statut, 3).' ';
print ' ';
@@ -638,8 +638,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '';
print ''.$langs->trans("ContributionsToPay").($num?' '.$num.' ';
print ''.$langs->trans("DateDue").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("Paid").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("Paid").' ';
print ' ';
print ' ';
if ($num)
@@ -658,18 +658,18 @@ 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;
$i++;
}
- print ''.$langs->trans("Total").' ';
- print ''.price($tot_ttc).' ';
- print ' ';
+ print ''.$langs->trans("Total").' ';
+ print ''.price($tot_ttc).' ';
+ print ' ';
print '';
print "";
print ''.$langs->trans("OrdersDeliveredToBill").' '.$num.' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("ToBill").' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("ToBill").' ';
print ' ';
print ' ';
@@ -765,7 +765,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print '';
print ' ';
print ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -777,9 +777,9 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print ' ';
print $societestatic->getNomUrl(1, 'customer', 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-$obj->tot_fttc).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).' ';
+ 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;
@@ -790,9 +790,9 @@ 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).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($tot_ht).' ';
+ print ''.price($tot_ttc).' ';
+ print ''.price($tot_tobill).' ';
print ' ';
print '
';
print '
';
print ''.$langs->trans("BillsCustomersUnpaid", $num).' '.$num.' ';
- print ''.$langs->trans("DateDue").' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("Received").' ';
+ print ''.$langs->trans("DateDue").' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("Received").' ';
print ' ';
print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->facture->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$obj->rowid;
@@ -901,10 +901,10 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print ' ' ;
print $societestatic->getNomUrl(1, 'customer', 44);
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 ''.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 ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).' ';
print '';
@@ -917,9 +917,9 @@ 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).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print '';
print '
';
print ''.$langs->trans("BillsSuppliersUnpaid", $num).' '.$num.' ';
- print ''.$langs->trans("DateDue").' ';
- if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("AmountTTC").' ';
- print ''.$langs->trans("Paid").' ';
+ print ''.$langs->trans("DateDue").' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.$langs->trans("AmountHT").' ';
+ print ''.$langs->trans("AmountTTC").' ';
+ print ''.$langs->trans("Paid").' ';
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 ''.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 ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).' ';
print '';
$total += $obj->total_ht;
@@ -1027,9 +1027,9 @@ 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).' ';
+ if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).' ';
+ print ''.price($total_ttc).' ';
+ print ''.price($totalam).' ';
print ' ';
print ''.$langs->trans('DateMaxPayment').' ';
if (!empty($conf->multicurrency->enabled)) {
print ''.$langs->trans('Currency').' ';
- print ''.$langs->trans('MulticurrencyAmountTTC').' ';
- print ''.$multicurrencyalreadypayedlabel.' ';
- print ''.$multicurrencyremaindertopay.' ';
- print ''.$langs->trans('MulticurrencyPaymentAmount').' ';
+ print ''.$langs->trans('MulticurrencyAmountTTC').' ';
+ print ''.$multicurrencyalreadypayedlabel.' ';
+ print ''.$multicurrencyremaindertopay.' ';
+ print ''.$langs->trans('MulticurrencyPaymentAmount').' ';
}
- print ''.$langs->trans('AmountTTC').' ';
- print ''.$alreadypayedlabel.' ';
- print ''.$remaindertopay.' ';
- print ''.$langs->trans('PaymentAmount').' ';
- print ' ';
+ print ''.$langs->trans('AmountTTC').' ';
+ print ''.$alreadypayedlabel.' ';
+ print ''.$remaindertopay.' ';
+ print ''.$langs->trans('PaymentAmount').' ';
+ print ' ';
print "\n";
$total=0;
@@ -635,7 +637,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Date
print ''.dol_print_date($db->jdate($objp->df), 'day')." \n";
- // Date Max Payment
+ // Due date
if ($objp->dlr > 0 )
{
print '';
@@ -650,7 +652,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
else
{
- print ' -- ';
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
print ' ';
// Multicurrency Price
- print '';
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
print price($sign * $multicurrency_payment);
@@ -673,12 +675,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print ' ';
- // Multicurrency Price
- print '';
+ // Multicurrency remain to pay
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
print ' ';
- print '';
+ print ' ';
// Add remind multicurrency amount
$namef = 'multicurrency_amount_'.$objp->facid;
@@ -690,12 +692,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
if (!empty($conf->use_javascript_ajax))
print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
- print ' id==$facid)?' style="font-weight: bold" ':'').'>'.price($sign * $objp->total_ttc).' ';
+ print 'id==$facid)?' style="font-weight: bold" ':'').'>'.price($sign * $objp->total_ttc).' ';
// Received or paid back
- print ''.price($sign * $paiement);
+ print ' '.price($sign * $paiement);
if ($creditnotes) print '+'.price($creditnotes);
if ($deposits) print '+'.price($deposits);
print ' ';
// Remain to take or to pay back
- print ''.price($sign * $remaintopay).' ';
+ print ''.price($sign * $remaintopay).' ';
//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
// Amount
- print '';
+ print ' ';
// Add remind amount
$namef = 'amount_'.$objp->facid;
@@ -726,12 +728,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
if (!empty($conf->use_javascript_ajax))
print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+ print ' ";
@@ -763,21 +765,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
// Print total
print '';
- print ''.$langs->trans('TotalTTC').' ';
+ print ''.$langs->trans('TotalTTC').' ';
if (!empty($conf->multicurrency->enabled)) {
print ''.price($sign * $total_ttc).' '.price($sign * $totalrecu);
+ print ' '.price($sign * $total_ttc).' '.price($sign * $totalrecu);
if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
if ($totalrecudeposits) print '+'.price($totalrecudeposits);
print ' '.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).' '.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).' ';
print " \n";
}
@@ -873,7 +875,7 @@ if (! GETPOST('action', 'aZ09'))
print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder);
print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder);
print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder);
- print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -885,7 +887,7 @@ if (! GETPOST('action', 'aZ09'))
print ''.$objp->ref." '.dol_print_date($db->jdate($objp->dp))." \n";
print ''.$objp->paiement_type.' '.$objp->num_paiement." \n";
- print ''.price($objp->amount).' ';
+ print ''.price($objp->amount).' ';
$parameters=array();
$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index ee69d8d89f3..f84a805caef 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -771,11 +771,6 @@ else
print '';
-/*if ($user->societe_id == 0 && count($accounts) == 1 && $action == 'new' && $user->rights->banque->cheque)
-{
- print '
'.$langs->trans('NewCheckReceipt').' ';
-}*/
-
if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
{
print '
'.$langs->trans('Validate').' ';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 71e7ef7194e..7307b3e1601 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -366,6 +366,7 @@ class Paiement extends CommonObject
if ($invoice->type == Facture::TYPE_DEPOSIT)
{
$amount_ht = $amount_tva = $amount_ttc = array();
+ $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
// Insert one discount by VAT rate category
$discount = new DiscountAbsolute($this->db);
@@ -384,6 +385,9 @@ class Paiement extends CommonObject
$amount_ht[$line->tva_tx] += $line->total_ht;
$amount_tva[$line->tva_tx] += $line->total_tva;
$amount_ttc[$line->tva_tx] += $line->total_ttc;
+ $multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
+ $multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
+ $multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
$i++;
}
}
@@ -392,6 +396,9 @@ class Paiement extends CommonObject
$discount->amount_ht = abs($amount_ht[$tva_tx]);
$discount->amount_tva = abs($amount_tva[$tva_tx]);
$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+ $discount->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
+ $discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
+ $discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
$discount->tva_tx = abs($tva_tx);
$result = $discount->create($user);
@@ -1110,7 +1117,7 @@ class Paiement extends CommonObject
/**
* get the right way of payment
*
- * @return string 'dolibarr' if standard comportment or paid in dolibarr currency, 'customer' if payment received from multicurrency inputs
+ * @return string 'dolibarr' if standard comportment or paid in main currency, 'customer' if payment received from multicurrency inputs
*/
function getWay()
{
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index aa4cf649bf2..e3c5ee54fe4 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -265,9 +265,9 @@ if ($action == 'create')
print '
';
//print ''.$langs->trans("SocialContribution").' ';
print ''.$langs->trans("DateDue").' ';
- print ''.$langs->trans("Amount").' ';
- print ''.$langs->trans("AlreadyPaid").' ';
- print ''.$langs->trans("RemainderToPay").' ';
+ print ''.$langs->trans("Amount").' ';
+ print ''.$langs->trans("AlreadyPaid").' ';
+ print ''.$langs->trans("RemainderToPay").' ';
print ''.$langs->trans("Amount").' ';
print " \n";
@@ -282,18 +282,18 @@ if ($action == 'create')
if ($objp->date_ech > 0)
{
- print "
".dol_print_date($objp->date_ech, 'day')." \n";
+ print '
'.dol_print_date($objp->date_ech, 'day').' '."\n";
}
else
{
print "
!!! \n";
}
- print '
'.price($objp->amount)." ";
+ print '
'.price($objp->amount)." ";
- print '
'.price($sumpaid)." ";
+ print '
'.price($sumpaid)." ";
- print '
'.price($objp->amount - $sumpaid)." ";
+ print '
'.price($objp->amount - $sumpaid)." ";
print '
';
if ($sumpaid < $objp->amount)
@@ -322,10 +322,10 @@ if ($action == 'create')
{
// Print total
print ' ';
- print ''.$langs->trans("Total").': ';
- print "".price($total_ttc)." ".price($totalrecu)." ".price($total_ttc - $totalrecu)." '.$langs->trans("Total").': ';
+ print ''.price($total_ttc).' '.price($totalrecu).' '.price($total_ttc - $totalrecu).' ';
print " \n";
}
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index c8ba8806c36..f7b2ec89008 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -109,10 +109,10 @@ if ($id > 0)
if (! empty($arrayfields['f.datef']['checked'])) print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
print '
'.$langs->trans("Element").' ';
print '
'.$langs->trans("Status").' ';
- print '
'.$langs->trans("Debit").' ';
- print '
'.$langs->trans("Credit").' ';
- print '
'.$langs->trans("Balance").' ';
- print '
'.$langs->trans("Author").' ';
+ print '
'.$langs->trans("Debit").' ';
+ print '
'.$langs->trans("Credit").' ';
+ print '
'.$langs->trans("Balance").' ';
+ print '
'.$langs->trans("Author").' ';
print '';
$TData = array();
@@ -261,18 +261,18 @@ if ($id > 0)
print '
'.$data['status'].' ';
- print '
'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." \n";
+ print '
'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." \n";
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
- print '
'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." \n";
+ print '
'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." \n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
// Balance
- print '
'.price($data['balance'])." \n";
+ print '
'.price($data['balance'])." \n";
// Author
- print '
';
+ print ' ';
print $data['author'];
print ' ';
@@ -281,9 +281,9 @@ if ($id > 0)
print '
';
print ' ';
- print ''.price($totalDebit).' ';
- print ''.price($totalCredit).' ';
- print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' ';
+ print ''.price($totalDebit).' ';
+ print ''.price($totalCredit).' ';
+ print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' ';
print ' \n";
}
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index fef607ac0dd..f0a01d1ae04 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -301,7 +301,7 @@ if ($modecompta == 'BOOKKEEPING')
// Get cpts of category/group
$cpts = $AccCat->getCptsCat(0, $tmppredefinedgroupwhere);
- foreach($cpts as $i => $cpt)
+ foreach($cpts as $j => $cpt)
{
$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']);
if ($return < 0) {
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index fcee95b688f..bd9f25bb0b8 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -405,7 +405,7 @@ elseif ($modecompta=="BOOKKEEPING")
// N-1
if (! empty($arrayofaccountforfilter))
{
- $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cpt['dc']?$cpt['dc']:0);
+ $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cat['dc']?$cat['dc']:0);
if ($return < 0) {
setEventMessages(null, $AccCat->errors, 'errors');
@@ -438,7 +438,7 @@ elseif ($modecompta=="BOOKKEEPING")
if (($k+1) < $start_month) $yeartoprocess++;
//var_dump($monthtoprocess.'_'.$yeartoprocess);
- $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']?$cpt['dc']:0, 'nofilter', $monthtoprocess, $yeartoprocess);
+ $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc']?$cat['dc']:0, 'nofilter', $monthtoprocess, $yeartoprocess);
if ($return < 0) {
setEventMessages(null, $AccCat->errors, 'errors');
$resultM=0;
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index e307a86ade9..f0c96dccdd6 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -101,8 +101,8 @@ function pt($db, $sql, $date)
print '
';
print ''.$date.' ';
- print ''.$langs->trans("ClaimedForThisPeriod").' ';
- print ''.$langs->trans("PaidDuringThisPeriod").' ';
+ print ''.$langs->trans("ClaimedForThisPeriod").' ';
+ print ''.$langs->trans("PaidDuringThisPeriod").' ';
print " \n";
$totalclaimed = 0;
@@ -122,8 +122,8 @@ function pt($db, $sql, $date)
{
print '
';
print ''.$previousmonth." \n";
- print ''.price($amountclaimed)." \n";
- print ''.price($amountpaid)." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
print " \n";
$amountclaimed = 0;
@@ -145,8 +145,8 @@ function pt($db, $sql, $date)
{
print '
';
print ''.$obj->dm." \n";
- print ''.price($amountclaimed)." \n";
- print ''.price($amountpaid)." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
print " \n";
$amountclaimed = 0;
$amountpaid = 0;
@@ -166,8 +166,8 @@ function pt($db, $sql, $date)
{
print '
';
print ''.$previousmonth." \n";
- print ''.price($amountclaimed)." \n";
- print ''.price($amountpaid)." \n";
+ print ''.price($amountclaimed)." \n";
+ print ''.price($amountpaid)." \n";
print " \n";
$amountclaimed = 0;
@@ -175,9 +175,9 @@ function pt($db, $sql, $date)
}
print '
';
- print ''.$langs->trans("Total").' ';
- print ''.price($totalclaimed).' ';
- print ''.price($totalpaid).' ';
+ print ''.$langs->trans("Total").' ';
+ print ''.price($totalclaimed).' ';
+ print ''.price($totalpaid).' ';
print " ";
print "
";
@@ -242,9 +242,9 @@ print load_fiche_titre($langs->trans("VATSummary"), '', '');
print '
';
print '';
print ''.$langs->trans("Year")." ".$y.' ';
-print ''.$langs->trans("VATToPay").' ';
-print ''.$langs->trans("VATToCollect").' ';
-print ''.$langs->trans("Balance").' ';
+print ''.$langs->trans("VATToPay").' ';
+print ''.$langs->trans("VATToCollect").' ';
+print ''.$langs->trans("Balance").' ';
print ' '."\n";
print ' '."\n";
@@ -444,7 +444,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
$x_coll_sum += $temp_vat;
}
}
- print "".price(price2num($x_coll_sum, 'MT'))." ";
+ print ''.price(price2num($x_coll_sum, 'MT')).' ';
$x_paye_sum = 0;
foreach (array_keys($x_paye) as $rate)
@@ -488,7 +488,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
$x_paye_sum += $temp_vat;
}
}
- print "".price(price2num($x_paye_sum, 'MT'))." ";
+ print ''.price(price2num($x_paye_sum, 'MT')).' ';
$subtotalcoll = $subtotalcoll + $x_coll_sum;
$subtotalpaye = $subtotalpaye + $x_paye_sum;
@@ -497,7 +497,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
$total = $total + $diff;
$subtotal = price2num($subtotal + $diff, 'MT');
- print "".price(price2num($diff, 'MT'))." \n";
+ print ''.price(price2num($diff, 'MT')).' '."\n";
print " \n";
print "\n";
@@ -505,16 +505,16 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
if ($i > 2)
{
print '';
- print ''.$langs->trans("SubTotal").' :'.price(price2num($subtotalcoll, 'MT')).' ';
- print ''.price(price2num($subtotalpaye, 'MT')).' ';
- print ''.price(price2num($subtotal, 'MT')).' ';
+ print ''.$langs->trans("SubTotal").' :'.price(price2num($subtotalcoll, 'MT')).' ';
+ print ''.price(price2num($subtotalpaye, 'MT')).' ';
+ print ''.price(price2num($subtotal, 'MT')).' ';
print ' ';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
}
}
-print ''.$langs->trans("TotalToPay").': '.price(price2num($total, 'MT')).' ';
+print ''.$langs->trans("TotalToPay").': '.price(price2num($total, 'MT')).' ';
print " \n";
print '';
print "";
- print '' . $langs->trans("VATDue") . ' ';
- print '' . price(price2num($total, 'MT')) . ' ';
+ print '' . $langs->trans("VATDue") . ' ';
+ print '' . price(price2num($total, 'MT')) . ' ';
print " \n";
print "";
- print '' . $langs->trans("VATPaid") . ' ';
- print '' . price(price2num($obj->mm, 'MT')) . " \n";
+ print '' . $langs->trans("VATPaid") . ' ';
+ print '' . price(price2num($obj->mm, 'MT')) . " \n";
print " \n";
$restopay = $total - $obj->mm;
print "";
- print '' . $langs->trans("RemainToPay") . ' ';
- print '' . price(price2num($restopay, 'MT')) . ' ';
+ print '' . $langs->trans("RemainToPay") . ' ';
+ print '' . price(price2num($restopay, 'MT')) . ' ';
print " \n";
print '
';
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index d3ec5e53f71..6d5f5ffbc13 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -188,8 +188,8 @@ if ($result)
$form->select_comptes($search_account, 'search_account', 0, '', 1);
print '';
}
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -200,9 +200,9 @@ if ($result)
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "t.label", "", $param, 'align="left"', $sortfield, $sortorder);
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "t.datev", "", $param, 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "t.datep", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'align="left"', $sortfield, $sortorder);
+ print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
if (! empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "t.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "t.amount", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -265,7 +265,7 @@ if ($result)
$colspan=5;
if (! empty($conf->banque->enabled)) $colspan++;
print ''.$langs->trans("Total").' ';
- print ''.price($total).' ';
+ print ''.price($total).' ';
print "
";
@@ -280,7 +280,6 @@ else
dol_print_error($db);
}
-
+// End of page
llxFooter();
-
$db->close();
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index f749df2b548..8b58bde4199 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -344,11 +344,11 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '
'.$productcust.' ';
if ($modetax != 1)
{
- print '
'.$amountcust.' ';
- print '
'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ print '
'.$amountcust.' ';
+ print '
'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
}
- print '
'.$langs->trans("AmountHTVATRealReceived").' ';
- print '
'.$vatcust.' ';
+ print '
'.$langs->trans("AmountHTVATRealReceived").' ';
+ print '
'.$vatcust.' ';
print '';
$action = "tvadetail";
@@ -390,7 +390,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '
';
// Ref
- print ''.$fields['link'].' ';
+ print ''.$fields['link'].' ';
// Invoice date
print '' . dol_print_date($fields['datef'], 'day') . ' ';
@@ -440,7 +440,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total HT
if ($modetax != 1)
{
- print '';
+ print ' ';
print price($fields['totalht']);
if (price2num($fields['ftotal_ttc']))
{
@@ -455,7 +455,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$ratiopaymentinvoice=1;
if ($modetax != 1)
{
- print ' ';
+ print ' ';
//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{
@@ -479,13 +479,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
}
// Total collected
- print ' ';
+ print ' ';
$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'), 1);
print ' ';
// VAT
- print '';
+ print ' ';
$temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat, 'MT'), 1);
//print price($fields['vat']);
@@ -500,13 +500,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total customers for this vat rate
print ' ';
print ''.$langs->trans("Total").': ';
+ print ''.$langs->trans("Total").': ';
if ($modetax != 1) {
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
}
- print ''.price(price2num($subtot_coll_total_ht, 'MT')).' ';
- print ''.price(price2num($subtot_coll_vat, 'MT')).' ';
+ print ''.price(price2num($subtot_coll_total_ht, 'MT')).' ';
+ print ''.price(price2num($subtot_coll_vat, 'MT')).' ';
print ' ';
}
@@ -514,13 +514,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
{
print '
';
print ''.$langs->trans("Total").': ';
+ print ''.$langs->trans("Total").': ';
if ($modetax != 1) {
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
}
- print ''.price(price2num(0, 'MT')).' ';
- print ''.price(price2num(0, 'MT')).' ';
+ print ''.price(price2num(0, 'MT')).' ';
+ print ''.price(price2num(0, 'MT')).' ';
print ' ';
}
@@ -536,11 +536,11 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '
'.$namesup.' ';
print '
'.$productsup.' ';
if ($modetax != 1) {
- print '
'.$amountsup.' ';
- print '
'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ print '
'.$amountsup.' ';
+ print '
'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
}
- print '
'.$langs->trans("AmountHTVATRealPaid").' ';
- print '
'.$vatsup.' ';
+ print '
'.$langs->trans("AmountHTVATRealPaid").' ';
+ print '
'.$vatsup.' ';
print ''."\n";
foreach (array_keys($x_paye) as $rate)
@@ -571,7 +571,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '
';
// Ref
- print ''.$fields['link'].' ';
+ print ''.$fields['link'].' ';
// Invoice date
print '' . dol_print_date($fields['datef'], 'day') . ' ';
@@ -621,7 +621,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total HT
if ($modetax != 1)
{
- print '';
+ print ' ';
print price($fields['totalht']);
if (price2num($fields['ftotal_ttc']))
{
@@ -636,7 +636,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$ratiopaymentinvoice=1;
if ($modetax != 1)
{
- print ' ';
+ print ' ';
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{
$paymentfourn_static->id=$fields['payment_id'];
@@ -662,13 +662,13 @@ if (! is_array($x_coll) || ! is_array($x_paye))
}
// VAT paid
- print ' ';
+ print ' ';
$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'), 1);
print ' ';
// VAT
- print '';
+ print ' ';
$temp_vat=$fields['vat']*$ratiopaymentinvoice;
print price(price2num($temp_vat, 'MT'), 1);
//print price($fields['vat']);
@@ -683,26 +683,26 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Total suppliers for this vat rate
print ' ';
print ''.$langs->trans("Total").': ';
+ print ''.$langs->trans("Total").': ';
if ($modetax != 1) {
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
}
- print ''.price(price2num($subtot_paye_total_ht, 'MT')).' ';
- print ''.price(price2num($subtot_paye_vat, 'MT')).' ';
+ print ''.price(price2num($subtot_paye_total_ht, 'MT')).' ';
+ print ''.price(price2num($subtot_paye_vat, 'MT')).' ';
print ' ';
}
if (count($x_paye) == 0) { // Show a total line if nothing shown
print '
';
print ''.$langs->trans("Total").': ';
+ print ''.$langs->trans("Total").': ';
if ($modetax != 1) {
- print ' ';
- print ' ';
+ print ' ';
+ print ' ';
}
- print ''.price(price2num(0, 'MT')).' ';
- print ''.price(price2num(0, 'MT')).' ';
+ print ''.price(price2num(0, 'MT')).' ';
+ print ''.price(price2num(0, 'MT')).' ';
print ' ';
}
@@ -714,7 +714,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$diff = $x_coll_sum - $x_paye_sum;
print '
';
print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
- print ''.price(price2num($diff, 'MT'))." '.price(price2num($diff, 'MT'))." \n";
$i++;
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 76ae63d7b7d..c74641876f1 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -126,11 +126,11 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
-
-
\ No newline at end of file
+
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 32e6643a53f..f1cc60bffd3 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -149,7 +149,7 @@ echo $this->control->tpl['ajax_selectcountry'];
-
+
@@ -159,4 +159,4 @@ echo $this->control->tpl['ajax_selectcountry'];
-
\ No newline at end of file
+
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 4f3817401b4..26f1bb8716a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -189,6 +189,7 @@ if (empty($reshook))
$object->skype = GETPOST("skype", 'alpha');
$object->twitter = GETPOST("twitter", 'alpha');
$object->facebook = GETPOST("facebook", 'alpha');
+ $object->linkedin = GETPOST("linkedin", 'alpha');
$object->email = GETPOST("email", 'alpha');
$object->phone_pro = GETPOST("phone_pro", 'alpha');
$object->phone_perso = GETPOST("phone_perso", 'alpha');
@@ -362,6 +363,7 @@ if (empty($reshook))
$object->skype = GETPOST("skype", 'alpha');
$object->twitter = GETPOST("twitter", 'alpha');
$object->facebook = GETPOST("facebook", 'alpha');
+ $object->linkedin = GETPOST("linkedin", 'alpha');
$object->phone_pro = GETPOST("phone_pro", 'alpha');
$object->phone_perso = GETPOST("phone_perso", 'alpha');
$object->phone_mobile = GETPOST("phone_mobile", 'alpha');
@@ -588,7 +590,7 @@ else
$rowspan=3;
if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
- print '';
+ print ' ';
print ''.$langs->trans('CopyAddressFromSoc').' ';
print ' ';
}
@@ -698,6 +700,12 @@ else
print ' '.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
}
+ // LinkedIn
+ if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
+ {
+ print '
'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).' ';
+ }
}
// Visibility
@@ -979,11 +987,17 @@ else
print '
twitter).'"> ';
}
// Facebook
- if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
- {
- print '
'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
- }
+ if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+ {
+ print '
'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
+ }
+ // LinkedIn
+ if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
+ {
+ print '
'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).' ';
+ }
}
// Visibility
@@ -1225,7 +1239,7 @@ else
// Other attributes
$cols = 3;
- $parameyers=array('socid'=>$socid);
+ $parameters=array('socid'=>$socid);
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
$object->load_ref_elements();
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 67b3900ec06..58204ae0c94 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -359,6 +359,7 @@ class Contact extends CommonObject
$sql .= ", skype='".$this->db->escape($this->skype)."'";
$sql .= ", twitter='".$this->db->escape($this->twitter)."'";
$sql .= ", facebook='".$this->db->escape($this->facebook)."'";
+ $sql .= ", linkedin='".$this->db->escape($this->linkedin)."'";
$sql .= ", photo='".$this->db->escape($this->photo)."'";
$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
$sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
@@ -455,6 +456,11 @@ class Contact extends CommonObject
$tmpobj->facebook = $this->facebook;
$usermustbemodified++;
}
+ if ($tmpobj->linkedin != $this->linkedin)
+ {
+ $tmpobj->linkedin = $this->linkedin;
+ $usermustbemodified++;
+ }
if ($usermustbemodified)
{
$result=$tmpobj->update($user, 0, 1, 1, 1);
@@ -705,7 +711,7 @@ class Contact extends CommonObject
$sql.= " c.fk_pays as country_id,";
$sql.= " c.fk_departement,";
$sql.= " c.birthday,";
- $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype, c.twitter, c.facebook,";
+ $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype, c.twitter, c.facebook, c.linkedin,";
$sql.= " c.photo,";
$sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
$sql.= " c.import_key,";
@@ -779,6 +785,7 @@ class Contact extends CommonObject
$this->skype = $obj->skype;
$this->twitter = $obj->twitter;
$this->facebook = $obj->facebook;
+ $this->linkedin = $obj->linkedin;
$this->photo = $obj->photo;
$this->priv = $obj->priv;
$this->mail = $obj->email;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index ebbe7332236..667965396a6 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -372,25 +372,25 @@ if ($sql_select)
// Filters
print '
';
- print '';
+ print ' ';
print ' ';
print ''; // date
print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle');
$formother->select_year($year?$year:-1, 'year', 1, 20, 1);
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print ''; // TODO: Add filters !
+ print ' '; // TODO: Add filters !
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -398,14 +398,14 @@ if ($sql_select)
// Titles with sort buttons
print ' ';
- print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
- print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
print " \n";
@@ -427,10 +427,10 @@ if ($sql_select)
print '
';
print $documentstatic->getNomUrl(1);
print ' ';
- print '
'.dol_print_date($db->jdate($objp->dateprint), 'day').' ';
+ print '
'.dol_print_date($db->jdate($objp->dateprint), 'day').' ';
// Status
- print '
';
+ print ' ';
if ($type_element == 'contract')
{
print $documentstaticline->getLibStatut(2);
@@ -590,13 +590,13 @@ if ($sql_select)
//print ' '.$prodreftxt.' ';
print '
'.$objp->libelle.' ';
- print '
'.$objp->prod_qty.' ';
+ print '
'.$objp->prod_qty.' ';
$total_qty+=$objp->prod_qty;
- print '
'.price($objp->total_ht).' ';
+ print '
'.price($objp->total_ht).' ';
$total_ht+=$objp->total_ht;
- print '
'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).' ';
+ print '
'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).' ';
print "\n";
$i++;
@@ -606,9 +606,9 @@ if ($sql_select)
print '
' . $langs->trans('Total') . ' ';
print '
';
print '
';
- print '
' . $total_qty . ' ';
- print '
' . price($total_ht) . ' ';
- print '
' . price($total_ht/(empty($total_qty)?1:$total_qty)) . ' ';
+ print '
' . $total_qty . ' ';
+ print '
' . price($total_ht) . ' ';
+ print '
' . price($total_ht/(empty($total_qty)?1:$total_qty)) . ' ';
print "
";
print '';
@@ -616,26 +616,23 @@ if ($sql_select)
print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
}
$db->free($resql);
-}
-elseif (empty($type_element) || $type_element == -1)
-{
+} elseif (empty($type_element) || $type_element == -1) {
print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
print ''."\n";
// Titles with sort buttons
print '';
- print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
- print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
print " \n";
print ''.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'
";
-}
-else {
+} else {
print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
print ''."\n";
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 71d86016fe6..b03f51629b6 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -10,6 +10,7 @@
* Copyright (C) 2018 Nicolas ZABOURI
* Copyright (C) 2018 Juanjo Menent
* Copyright (C) 2019 Frédéric France
+ * Copyright (C) 2019 Josep Lluís Amador
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -68,9 +69,11 @@ $search_phone_pro=GETPOST("search_phone_pro", 'alpha');
$search_phone_mobile=GETPOST("search_phone_mobile", 'alpha');
$search_fax=GETPOST("search_fax", 'alpha');
$search_email=GETPOST("search_email", 'alpha');
+$search_no_email=GETPOST("search_no_email",'int');
$search_skype=GETPOST("search_skype", 'alpha');
$search_twitter=GETPOST("search_twitter", 'alpha');
$search_facebook=GETPOST("search_facebook", 'alpha');
+$search_linkedin=GETPOST("search_linkedin", 'alpha');
$search_priv=GETPOST("search_priv", 'alpha');
$search_categ=GETPOST("search_categ", 'int');
$search_categ_thirdparty=GETPOST("search_categ_thirdparty", 'int');
@@ -159,10 +162,12 @@ $arrayfields=array(
'p.phone_mobile'=>array('label'=>"PhoneMobile", 'checked'=>1),
'p.fax'=>array('label'=>"Fax", 'checked'=>0),
'p.email'=>array('label'=>"EMail", 'checked'=>1),
+ 'p.no_email'=>array('label'=>"No_Email", 'checked'=>0, 'enabled'=>(! empty($conf->mailing->enabled))),
'p.jabberid'=>array('label'=>"Jabber", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.skype'=>array('label'=>"Skype", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.twitter'=>array('label'=>"Twitter", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.facebook'=>array('label'=>"Facebook", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
+ 'p.linkedin'=>array('label'=>"LinkedIn", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.thirdparty'=>array('label'=>"ThirdParty", 'checked'=>1, 'enabled'=>empty($conf->global->SOCIETE_DISABLE_CONTACTS)),
'p.priv'=>array('label'=>"ContactVisibility", 'checked'=>1, 'position'=>200),
'p.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
@@ -222,9 +227,11 @@ if (empty($reshook))
$search_phone_mobile="";
$search_fax="";
$search_email="";
+ $search_no_email=-1;
$search_skype="";
$search_twitter="";
$search_facebook="";
+ $search_linkedin="";
$search_priv="";
$search_status=-1;
$search_categ='';
@@ -258,7 +265,7 @@ $contactstatic=new Contact($db);
$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
$sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql.= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.skype,";
+$sql.= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.no_email, p.skype,";
$sql.= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
$sql.= " co.code as country_code";
// Add fields from extrafields
@@ -321,10 +328,12 @@ if (strlen($search_fax)) $sql.= natural_search('p.fax', $search_fax);
if (strlen($search_skype)) $sql.= natural_search('p.skype', $search_skype);
if (strlen($search_twitter)) $sql.= natural_search('p.twitter', $search_twitter);
if (strlen($search_facebook)) $sql.= natural_search('p.facebook', $search_facebook);
+if (strlen($search_linkedin)) $sql.= natural_search('p.linkedin', $search_linkedin);
if (strlen($search_email)) $sql.= natural_search('p.email', $search_email);
if (strlen($search_zip)) $sql.= natural_search("p.zip", $search_zip);
if (strlen($search_town)) $sql.= natural_search("p.town", $search_town);
+if ($search_no_email != '' && $search_no_email >= 0) $sql.= " AND p.no_email = ".$db->escape($search_no_email);
if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status);
if ($search_import_key) $sql.= natural_search("p.import_key", $search_import_key);
if ($type == "o") // filtre sur type
@@ -422,6 +431,7 @@ if ($search_phone_perso != '') $param.='&search_phone_perso='.urlencode($sea
if ($search_phone_mobile != '') $param.='&search_phone_mobile='.urlencode($search_phone_mobile);
if ($search_fax != '') $param.='&search_fax='.urlencode($search_fax);
if ($search_email != '') $param.='&search_email='.urlencode($search_email);
+if ($search_no_email != '') $param.='&search_no_email='.urlencode($search_no_email);
if ($search_status != '') $param.='&search_status='.urlencode($search_status);
if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv);
if ($search_import_key != '') $param.='&search_import_key='.urlencode($search_import_key);
@@ -607,6 +617,12 @@ if (! empty($arrayfields['p.email']['checked']))
print '';
+ print $form->selectarray('search_no_email', array('-1'=>'', '0'=>$langs->trans('No'),'1'=>$langs->trans('Yes')),$search_no_email);
+ print ' ';
+}
if (! empty($arrayfields['p.skype']['checked']))
{
print '';
@@ -625,6 +641,12 @@ if (! empty($arrayfields['p.facebook']['checked']))
print ' ';
}
+if (! empty($arrayfields['p.linkedin']['checked']))
+{
+ print '';
+ print ' ';
+}
if (! empty($arrayfields['p.thirdparty']['checked']))
{
print '';
@@ -688,28 +710,45 @@ if (! empty($arrayfields['p.zip']['checked'])) print_liste_field
if (! empty($arrayfields['p.town']['checked'])) print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $param, '', $sortfield, $sortorder);
//if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
//if (! empty($arrayfields['region.nom']['checked'])) print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['country.code_iso']['checked'])) {
+ print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+}
if (! empty($arrayfields['p.phone']['checked'])) print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.phone_perso']['checked'])) print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.phone_mobile']['checked'])) print_liste_field_titre($arrayfields['p.phone_mobile']['label'], $_SERVER["PHP_SELF"], "p.phone_mobile", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.fax']['checked'])) print_liste_field_titre($arrayfields['p.fax']['label'], $_SERVER["PHP_SELF"], "p.fax", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.email']['checked'])) print_liste_field_titre($arrayfields['p.email']['label'], $_SERVER["PHP_SELF"], "p.email", $begin, $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['p.no_email']['checked'])) print_liste_field_titre($arrayfields['p.no_email']['label'],$_SERVER["PHP_SELF"],"p.no_email", $begin, $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['p.skype']['checked'])) print_liste_field_titre($arrayfields['p.skype']['label'], $_SERVER["PHP_SELF"], "p.skype", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.twitter']['checked'])) print_liste_field_titre($arrayfields['p.twitter']['label'], $_SERVER["PHP_SELF"], "p.twitter", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.facebook']['checked'])) print_liste_field_titre($arrayfields['p.facebook']['label'], $_SERVER["PHP_SELF"], "p.facebook", $begin, $param, '', $sortfield, $sortorder);
+if (! empty($arrayfields['p.linkedin']['checked'])) print_liste_field_titre($arrayfields['p.linkedin']['label'], $_SERVER["PHP_SELF"], "p.linkedin", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.thirdparty']['checked'])) print_liste_field_titre($arrayfields['p.thirdparty']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['p.priv']['checked'])) print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
+$parameters = array(
+ 'arrayfields'=>$arrayfields,
+ 'param'=>$param,
+ 'sortfield'=>$sortfield,
+ 'sortorder'=>$sortorder,
+);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (! empty($arrayfields['p.statut']['checked'])) print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
-if (! empty($arrayfields['p.import_key']['checked'])) print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['p.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (! empty($arrayfields['p.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (! empty($arrayfields['p.statut']['checked'])) {
+ print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (! empty($arrayfields['p.import_key']['checked'])) {
+ print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
@@ -824,7 +863,12 @@ while ($i < min($num, $limit))
print ' '.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18).' ';
if (! $i) $totalarray['nbfield']++;
}
-
+ // No EMail
+ if (! empty($arrayfields['p.no_email']['checked']))
+ {
+ print ''.yn($obj->no_email).' ';
+ if (! $i) $totalarray['nbfield']++;
+ }
// Skype
if (! empty($arrayfields['p.skype']['checked']))
{
@@ -844,12 +888,18 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// Facebook
- if (! empty($arrayfields['p.facebook']['checked']))
- {
- if (! empty($conf->socialnetworks->enabled)) { print ''.dol_print_socialnetworks($obj->facebook, $obj->rowid, $obj->socid, 'facebook').' '; }
- if (! $i) $totalarray['nbfield']++;
- }
- // Company
+ if (! empty($arrayfields['p.facebook']['checked']))
+ {
+ if (! empty($conf->socialnetworks->enabled)) { print ''.dol_print_socialnetworks($obj->facebook, $obj->rowid, $obj->socid, 'facebook').' '; }
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // LinkedIn
+ if (! empty($arrayfields['p.linkedin']['checked']))
+ {
+ if (! empty($conf->socialnetworks->enabled)) { print ''.dol_print_socialnetworks($obj->linkedin, $obj->rowid, $obj->socid, 'linkedin').' '; }
+ if (! $i) $totalarray['nbfield']++;
+ }
+ // Company
if (! empty($arrayfields['p.thirdparty']['checked']))
{
print '';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 6114f49930c..118ad0f5c67 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -157,13 +157,13 @@ if ($action == 'edit')
print ' ';
// Photo
- print '';
+ print ' ';
print $form->showphoto('contact', $object)."\n";
if ($object->photo) print " ';
print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print ' ';
}
print ''."\n";
@@ -1254,7 +1254,7 @@ if ($action == 'create')
print ''.$langs->trans("Project").' ';
$formproject->select_projects(($soc->id>0?$soc->id:-1), $projectid, "projectid", 0, 0, 1, 1);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print " ';
print ''.$langs->trans("ServiceNb", $cursorline).' ';
print ''.$langs->trans("VAT").' ';
- print ''.$langs->trans("PriceUHT").' ';
+ print ''.$langs->trans("PriceUHT").' ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.$langs->trans("PriceUHTCurrency").' ';
+ print ''.$langs->trans("PriceUHTCurrency").' ';
}
print ''.$langs->trans("Qty").' ';
- if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").' ';
- print ''.$langs->trans("ReductionShort").' ';
- if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.$langs->trans("BuyingPrice").' ';
+ if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").' ';
+ print ''.$langs->trans("ReductionShort").' ';
+ if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.$langs->trans("BuyingPrice").' ';
print ' ';
print " \n";
@@ -1618,10 +1618,10 @@ else
print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
print '';
// Price
- print ''.($objp->subprice != '' ? price($objp->subprice) : '')." \n";
+ print ''.($objp->subprice != '' ? price($objp->subprice) : '')." \n";
// Price multicurrency
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($objp->multicurrency_subprice).' ';
+ print ''.price($objp->multicurrency_subprice).' ';
}
// Quantite
print ''.$objp->qty.' ';
@@ -1630,7 +1630,7 @@ else
// Remise
if ($objp->remise_percent > 0)
{
- print ''.$objp->remise_percent."% \n";
+ print ''.$objp->remise_percent."% \n";
}
else
{
@@ -1641,7 +1641,7 @@ else
if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.price($objp->pa_ht).' ';
// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
- print '';
+ print ' ';
if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
{
print '';
@@ -1746,10 +1746,10 @@ else
$doleditor->Create();
print ' ';
- print '';
+ print ' ';
print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
print ' ';
- print '';
+ print ' ';
if ($objp->fk_product) print ' ';
}
@@ -1880,7 +1880,7 @@ else
print '';
print ''.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' ';
- print '';
+ print ' ';
if ($user->societe_id == 0)
{
if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 5b3493a7249..1e8fbcbfdee 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -156,11 +156,11 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.='';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
// Ref supplier
$morehtmlref.='
';
$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
// Thirdparty
$morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
// Project
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 60daaa22ce4..64ecff642f7 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -128,11 +128,11 @@ if ($object->id)
$morehtmlref.='
';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
// Ref supplier
$morehtmlref.='
';
$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
// Thirdparty
$morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
// Project
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index dfcb1e8457c..05135f39aeb 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -189,7 +189,7 @@ foreach($listofstatus as $status)
print '
';
print ''.$staticcontratligne->LibStatut($status, 0, ($bool?1:0)).' ';
- print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' '.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' \n";
}
if ($status==4 && ! $bool) $bool=true;
@@ -218,15 +218,15 @@ foreach($listofstatus as $status)
{
print '
';
print ''.$staticcontratligne->LibStatut($status, 0, ($bool?1:0)).' ';
- print ''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' '.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status, 3, ($bool?1:0)).' \n";
}
}
//if ($totalinprocess != $total)
-//print '
'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").') '.$totalinprocess.' ';
-print '
'.$langs->trans("Total").' '.$total.' ';
+//print '
'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").') '.$totalinprocess.' ';
+print '
'.$langs->trans("Total").' '.$total.' ';
print "
'.$langs->trans("LastContracts", 5).' ';
print ''.$langs->trans("DateModification").' ';
- //print ''.$langs->trans("Status").' ';
+ //print ''.$langs->trans("Status").' ';
print ''.$langs->trans("Services").' ';
print "'.dol_print_date($db->jdate($obj->tms), 'dayhour').' ';
//print ''.$staticcontrat->LibStatut($obj->statut,2).' ';
- print ''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0, 3):'').' ';
- print ''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4, 3, 0):'').' ';
- print ''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4, 3, 1):'').' ';
- print ''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5, 3):'').' ';
+ print ''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0, 3):'').' ';
+ print ''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4, 3, 0):'').' ';
+ print ''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4, 3, 1):'').' ';
+ print ''.($obj->nb_closed>0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5, 3):'').' ';
print "\n";
$i++;
}
@@ -432,7 +432,7 @@ if ($resql)
$staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1, '', 20);
print '';
- print '';
+ print ' ';
$dateend=$db->jdate($obj->date_fin_validite);
print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
print ' ';
+ print ' ';
print $staticcontratligne->LibStatut($obj->statut, 3);
print ' ';
+ print ' ';
print $staticcontratligne->LibStatut($obj->statut, 3, 1);
print ' ';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
// Ref supplier
$morehtmlref.='
';
$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
// Thirdparty
$morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
// Project
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 24dccaae25d..fb2422b7762 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -559,7 +559,7 @@ if (! empty($arrayfields['lower_planned_end_date']['checked']))
// Status
if (! empty($arrayfields['status']['checked']))
{
- print '
';
+ print '
';
}
print '
';
$searchpicto=$form->showFilterButtons();
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 1ab0edfbcf3..886e836f10e 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -96,11 +96,11 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.='';
// Ref customer
$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
// Ref supplier
$morehtmlref.='
';
$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
// Thirdparty
$morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
// Project
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 68f8595c294..f2d827b87cb 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -394,7 +394,7 @@ $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // N
print $hookmanager->resPrint;
if (! empty($arrayfields['cd.datec']['checked'])) print_liste_field_titre($arrayfields['cd.datec']['label'], $_SERVER["PHP_SELF"], "cd.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['cd.tms']['checked'])) print_liste_field_titre($arrayfields['cd.tms']['label'], $_SERVER["PHP_SELF"], "cd.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "cd.statut,c.statut", "", $param, 'align="right"', $sortfield, $sortorder);
+if (! empty($arrayfields['status']['checked'])) print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "cd.statut,c.statut", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -511,7 +511,7 @@ if (! empty($arrayfields['cd.tms']['checked']))
if (! empty($arrayfields['status']['checked']))
{
// Status
- print '
';
+ print ' ';
$arrayofstatus=array(
'0'=>$langs->trans("ServiceStatusInitial"),
'4'=>$langs->trans("ServiceStatusRunning"),
@@ -523,7 +523,7 @@ if (! empty($arrayfields['status']['checked']))
print ' ';
}
// Action column
-print '
';
+print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -589,7 +589,7 @@ while ($i < min($num, $limit))
}
if (! empty($arrayfields['cd.total_ht']['checked']))
{
- print '
';
+ print ' ';
print price($obj->total_ht);
print ' ';
$totalarray['totalht'] += $obj->total_ht;
@@ -601,7 +601,7 @@ while ($i < min($num, $limit))
}
if (! empty($arrayfields['cd.total_tva']['checked']))
{
- print '
';
+ print ' ';
print price($obj->total_tva);
print ' ';
$totalarray['totalvat'] += $obj->total_tva;
@@ -613,14 +613,14 @@ while ($i < min($num, $limit))
}
if (! empty($arrayfields['cd.tva_tx']['checked']))
{
- print '
';
+ print ' ';
print price2num($obj->tva_tx).'%';
print ' ';
if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['cd.subprice']['checked']))
{
- print '
';
+ print ' ';
print price($obj->subprice);
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -698,7 +698,7 @@ while ($i < min($num, $limit))
// Status
if (! empty($arrayfields['status']['checked']))
{
- print '
';
+ print ' ';
if ($obj->cstatut == 0) // If contract is draft, we say line is also draft
{
print $contractstatic->LibStatut(0, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
@@ -735,9 +735,9 @@ if (isset($totalarray['displaytotalline'])) {
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print '
'.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalhtfield'] == $i) print '
'.price($totalarray['totalht']).' ';
- elseif ($totalarray['totalvatfield'] == $i) print '
'.price($totalarray['totalvat']).' ';
- elseif ($totalarray['totalttcfield'] == $i) print '
'.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtfield'] == $i) print '
'.price($totalarray['totalht']).' ';
+ elseif ($totalarray['totalvatfield'] == $i) print '
'.price($totalarray['totalvat']).' ';
+ elseif ($totalarray['totalttcfield'] == $i) print '
'.price($totalarray['totalttc']).' ';
else print '
';
}
print '';
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 7dab385681a..d63df9f87b9 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -51,7 +51,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
getNomUrl(1); ?>
date_contrat, 'day'); ?>
-
$objectlink)
}
echo price($totalcontrat);
} ?>
-
getLibStatut(7); ?>
-
">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
+
getLibStatut(7); ?>
+
">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 1e5e31b4385..46a5e0e6d7d 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -425,7 +425,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print '
';*/
// Nb of docs
- print '
';
+ print ' ';
print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:' ';
print ' ';
print '
';
@@ -433,19 +433,19 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print ' ';
// Edit link
- print '
'.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').' ';
// Add link
- //print '
'.img_edit_add().' ';
- //print '
';
+ //print '
'.img_edit_add().' ';
+ //print '
';
// Info
if ($modulepart == 'ecm')
{
- print '
';
+ print ' ';
$userstatic->id=isset($val['fk_user_c'])?$val['fk_user_c']:0;
$userstatic->lastname=isset($val['login_c'])?$val['login_c']:0;
$htmltooltip=''.$langs->trans("ECMSection").' : '.$val['label'].'
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2005-2012 Maxime Kohlhaas
- * Copyright (C) 2015 Frederic France
+ * Copyright (C) 2015-2019 Frédéric France
* Copyright (C) 2015 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -117,6 +117,8 @@ class box_produits_alerte_stock extends ModeleBoxes
while ($line < $num) {
$objp = $db->fetch_object($result);
$datem=$db->jdate($objp->tms);
+ $price = '';
+ $price_base_type = '';
// Multilangs
if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 7ab97832637..24df09cdc92 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -59,7 +59,7 @@ class box_project extends ModeleBoxes
$langs->loadLangs(array('boxes', 'projects'));
$this->db = $db;
- $this->boxlabel="Projects";
+ $this->boxlabel="OpenedProjects";
$this->hidden=! ($user->rights->projet->lire);
}
@@ -89,21 +89,17 @@ class box_project extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$projectstatic = new Project($this->db);
- $socid=$user->societe_id;
-
- // Get list of project id allowed to user (in a string list separated by coma)
+ $socid=0;
+ //if ($user->societe_id > 0) $socid = $user->societe_id; // For external user, no check is done on company because readability is managed by public status of project and assignement.
+
+ // Get list of project id allowed to user (in a string list separated by coma)
$projectsListId='';
if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
- if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
- $sql.= " WHERE p.entity IN (".getEntity('project').')';
- if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
- if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
- if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
- if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+ $sql.= " WHERE p.fk_statut = 1"; // Only open projects
+ if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
$sql.= " ORDER BY p.datec DESC";
//$sql.= $db->plimit($max, 0);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 98d7e720628..c1b483efe8c 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -570,7 +570,7 @@ abstract class CommonDocGenerator
'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
);
- // Units
+ // Units
if ($conf->global->PRODUCT_USE_UNITS)
{
$resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
@@ -882,7 +882,7 @@ abstract class CommonDocGenerator
// Sorting
- uasort ($this->cols, array( $this, 'columnSort' ));
+ uasort($this->cols, array($this, 'columnSort'));
// Positionning
$curX = $this->page_largeur-$this->marge_droite; // start from right
@@ -945,10 +945,10 @@ abstract class CommonDocGenerator
}
/**
- * get column content width from column key
+ * get column content width from column key
*
- * @param string $colKey the column key
- * @return float width in mm
+ * @param string $colKey the column key
+ * @return float width in mm
*/
function getColumnContentWidth($colKey)
{
@@ -1025,13 +1025,13 @@ abstract class CommonDocGenerator
/**
- * print standard column content
+ * print standard column content
*
- * @param PDF $pdf pdf object
- * @param float $curY curent Y position
- * @param string $colKey the column key
- * @param string $columnText column text
- * @return int new rank on success and -1 on error
+ * @param PDF $pdf pdf object
+ * @param float $curY curent Y position
+ * @param string $colKey the column key
+ * @param string $columnText column text
+ * @return int new rank on success and -1 on error
*/
function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1f86d60598c..98b9d93580a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -672,6 +672,8 @@ abstract class CommonObject
$outdone++;
if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
$outdone++;
+ if ($this->linkedin) $out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+ $outdone++;
}
$out.='';
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index eb44fac13ea..9615c040eb0 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -53,10 +53,13 @@ class DiscountAbsolute
*/
public $fk_soc;
- public $discount_type; // 0 => customer discount, 1 => supplier discount
- public $amount_ht; //
+ public $discount_type; // 0 => customer discount, 1 => supplier discount
+ public $amount_ht; //
public $amount_tva; //
public $amount_ttc; //
+ public $multicurrency_amount_ht;
+ public $multicurrency_amount_tva;
+ public $multicurrency_amount_ttc;
public $tva_tx; // Vat rate
/**
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index e335975e503..7fd9258ddd7 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -936,14 +936,14 @@ class DolGraph
$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-','.'))));
$this->stringtoshow =''."\n";
- if (! empty($this->title)) $this->stringtoshow.=''.$this->title.'
';
+ if (! empty($this->title)) $this->stringtoshow.=''.$this->title.'
';
if (! empty($this->shownographyet))
{
$this->stringtoshow.='
';
$this->stringtoshow.=''.$langs->trans("NotEnoughDataYet").'
';
return;
}
- $this->stringtoshow.='
'."\n";
+ $this->stringtoshow.='
'."\n";
$this->stringtoshow.='';
- echo $dialog;
- if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
- echo '';
- } elseif ($parameters['currentcontext'] == 'membercard') {
- echo '';
- } elseif ($parameters['currentcontext'] == 'contactcard') {
- echo '';
- }
- if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
- echo '';
- } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
- echo '';
- } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
- echo '';
- }
+ return false;
+ });
+ } );
+ ';
+ echo $dialog;
+ if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+ echo '';
+ } elseif ($parameters['currentcontext'] == 'membercard') {
+ echo '';
+ } elseif ($parameters['currentcontext'] == 'contactcard') {
+ echo '';
+ }
+ if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+ echo '';
+ } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
+ echo '';
+ } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
+ echo '';
+ }
}
}
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 4b89b79e273..01953fba0ee 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -30,11 +30,11 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
*/
Class DataPolicy
{
- /**
- * getAllContactNotInformed
- *
- * @return number
- */
+ /**
+ * getAllContactNotInformed
+ *
+ * @return number
+ */
function getAllContactNotInformed()
{
global $langs, $conf, $db, $user;
@@ -144,71 +144,71 @@ Class DataPolicy
*/
function sendMailDataPolicyContact($contact)
{
- global $langs, $conf, $db, $user;
+ global $langs, $conf, $db, $user;
- $error = 0;
+ $error = 0;
- $from = $user->getFullName($langs) . ' <' . $user->email . '>';
+ $from = $user->getFullName($langs) . ' <' . $user->email . '>';
- $sendto = $contact->email;
- $code= md5($contact->email);
- if (!empty($contact->default_lang)) {
- $l = $contact->default_lang;
- } else {
- $l = $langs->defaultlang;
- }
- $s = "DATAPOLICIESSUBJECT_" . $l;
- $ma = "DATAPOLICIESCONTENT_" . $l;
- $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l;
- $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l;
+ $sendto = $contact->email;
+ $code= md5($contact->email);
+ if (!empty($contact->default_lang)) {
+ $l = $contact->default_lang;
+ } else {
+ $l = $langs->defaultlang;
+ }
+ $s = "DATAPOLICIESSUBJECT_" . $l;
+ $ma = "DATAPOLICIESCONTENT_" . $l;
+ $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l;
+ $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l;
- $subject = $conf->global->$s;
- $message = $conf->global->$ma;
- $linka = $conf->global->$la;
- $linkr = $conf->global->$lr;
- $sendtocc = $sendtobcc = '';
- $filepath = $mimetype = $filename = array();
- $deliveryreceipt = 0;
+ $subject = $conf->global->$s;
+ $message = $conf->global->$ma;
+ $linka = $conf->global->$la;
+ $linkr = $conf->global->$lr;
+ $sendtocc = $sendtobcc = '';
+ $filepath = $mimetype = $filename = array();
+ $deliveryreceipt = 0;
- $substitutionarray = array(
- '__LINKACCEPT__' => ''.$linka.' ',
- '__LINKREFUSED__' => ''.$linkr.' ',
- '__FIRSTNAME__' => $contact->firstname,
- '__NAME__' => $contact->lastname,
- '__CIVILITY__' => $contact->civility,
- );
- $subject = make_substitutions($subject, $substitutionarray);
- $message = make_substitutions($message, $substitutionarray);
+ $substitutionarray = array(
+ '__LINKACCEPT__' => ''.$linka.' ',
+ '__LINKREFUSED__' => ''.$linkr.' ',
+ '__FIRSTNAME__' => $contact->firstname,
+ '__NAME__' => $contact->lastname,
+ '__CIVILITY__' => $contact->civility,
+ );
+ $subject = make_substitutions($subject, $substitutionarray);
+ $message = make_substitutions($message, $substitutionarray);
- $actiontypecode = 'AC_EMAIL';
- $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
- if ($message) {
- if ($sendtocc)
- $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
- $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
- $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
- $actionmsg = dol_concatdesc($actionmsg, $message);
- }
+ $actiontypecode = 'AC_EMAIL';
+ $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
+ if ($message) {
+ if ($sendtocc)
+ $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+ $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+ $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+ $actionmsg = dol_concatdesc($actionmsg, $message);
+ }
- // Send mail
- require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+ // Send mail
+ require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+ $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
- if ($mailfile->error) {
- $resultmasssend .= '' . $mailfile->error . '
';
- } else {
- $result4 = $mailfile->sendfile();
- if (!$error) {
+ if ($mailfile->error) {
+ $resultmasssend .= '' . $mailfile->error . '
';
+ } else {
+ $result4 = $mailfile->sendfile();
+ if (!$error) {
- $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "'.$linka.' ',
'__LINKREFUSED__' => ''.$linkr.' ',
- );
- $subject = make_substitutions($subject, $substitutionarray);
- $message = make_substitutions($message, $substitutionarray);
+ );
+ $subject = make_substitutions($subject, $substitutionarray);
+ $message = make_substitutions($message, $substitutionarray);
- $actiontypecode = 'AC_EMAIL';
- $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
- if ($message) {
- if ($sendtocc) {
+ $actiontypecode = 'AC_EMAIL';
+ $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
+ if ($message)
+ {
+ if ($sendtocc)
+ {
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
}
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
@@ -264,23 +266,23 @@ Class DataPolicy
$actionmsg .= dol_concatdesc($actionmsg, $message);
}
- // Send mail
- require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
- if ($mailfile->error) {
- $resultmasssend .= '' . $mailfile->error . '
';
- } else {
- $result4 = $mailfile->sendfile();
+ // Send mail
+ require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+ $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+ if ($mailfile->error) {
+ $resultmasssend .= '' . $mailfile->error . '
';
+ } else {
+ $result4 = $mailfile->sendfile();
- if (!$error) {
- $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "'.$linka.' ',
'__LINKREFUSED__' => ''.$linkr.' ',
- );
- $subject = make_substitutions($subject, $substitutionarray);
- $message = make_substitutions($message, $substitutionarray);
+ );
+ $subject = make_substitutions($subject, $substitutionarray);
+ $message = make_substitutions($message, $substitutionarray);
- $actiontypecode = 'AC_EMAIL';
- $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
- if ($message) {
- if ($sendtocc) {
+ $actiontypecode = 'AC_EMAIL';
+ $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
+ if ($message) {
+ if ($sendtocc) {
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
}
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
$actionmsg .= dol_concatdesc($actionmsg, $message);
- }
+ }
- // Send mail
- require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
- if ($mailfile->error) {
- $resultmasssend .= '' . $mailfile->error . '
';
- } else {
- $result4 = $mailfile->sendfile();
+ // Send mail
+ require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+ $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+ if ($mailfile->error) {
+ $resultmasssend .= '' . $mailfile->error . '
';
+ } else {
+ $result4 = $mailfile->sendfile();
- if (!$error) {
- $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
* Copyright (C) 2018 Frédéric France
*
* This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
*/
/**
- * \file datapolicy/class/datapolicycron.class.php
+ * \file htdocs/datapolicy/class/datapolicycron.class.php
* \ingroup datapolicy
* \brief Example hook overload.
*/
@@ -27,11 +27,11 @@
*/
class DataPolicyCron
{
- /**
- * Function exec
- *
- * @return boolean
- */
+ /**
+ * Function exec
+ *
+ * @return boolean
+ */
public function exec()
{
global $conf, $db, $langs, $user;
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index 41c92299989..b72417d7ff9 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
*/
/**
- * \file datapolicy/lib/datapolicy.lib.php
+ * \file htdocs/datapolicy/lib/datapolicy.lib.php
* \ingroup datapolicy
* \brief Library files with common functions for datapolicy
*/
@@ -28,27 +29,26 @@
*/
function datapolicyAdminPrepareHead()
{
- global $langs, $conf;
+ global $langs, $conf;
- $langs->load("datapolicy@datapolicy");
+ $langs->load("datapolicy@datapolicy");
- $h = 0;
- $head = array();
+ $h = 0;
+ $head = array();
- $head[$h][0] = dol_buildpath("/datapolicy/admin/setup.php", 1);
- $head[$h][1] = $langs->trans("Deletion");
- $head[$h][2] = 'settings';
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
+ $head[$h][1] = $langs->trans("Deletion");
+ $head[$h][2] = 'settings';
+ $h++;
- if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
- {
- $head[$h][0] = dol_buildpath("/datapolicy/admin/setupmail.php", 1);
- $head[$h][1] = $langs->trans("DATAPOLICIESMail");
- $head[$h][2] = 'settings';
- $h++;
- }
+ if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
+ $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
+ $head[$h][1] = $langs->trans("DATAPOLICIESMail");
+ $head[$h][2] = 'settings';
+ $h++;
+ }
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy');
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy');
- return $head;
+ return $head;
}
diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/mailing.php
index e3f38b269be..69da78e00ac 100644
--- a/htdocs/datapolicy/mailing.php
+++ b/htdocs/datapolicy/mailing.php
@@ -1,5 +1,6 @@
+/* Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,22 +17,22 @@
*/
/**
- * \file datapolicy/mailing.php
+ * \file htdocs/datapolicy/mailing.php
* \ingroup datapolicy
* \brief datapolicy mailing page.
*/
require '../../main.inc.php';
-dol_include_once('/contact/class/contact.class.php');
-dol_include_once('/datapolicy/class/datapolicy.class.php');
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
$idcontact = GETPOST('idc');
-if(!empty($idcontact)){
+if (!empty($idcontact)) {
$contact = new Contact($db);
$contact->fetch($idcontact);
DataPolicy::sendMailDataPolicyContact($contact);
-}else{
+} else {
$contacts = new DataPolicy($db);
$contacts->getAllContactNotInformed();
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index f819fb079f5..6c78f380b93 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -17,7 +17,7 @@
*/
/**
- * \file datapolicy/admin/setup.php
+ * \file htdocs/datapolicy/admin/setup.php
* \ingroup datapolicy
* \brief datapolicy setup page.
*/
@@ -30,11 +30,11 @@ if (!defined('NOREQUIREMENU'))
define('NOREQUIREMENU', '1');
require '../../main.inc.php';
-dol_include_once('/contact/class/contact.class.php');
-dol_include_once('/societe/class/societe.class.php');
-dol_include_once('/adherents/class/adherent.class.php');
-dol_include_once('/user/class/user.class.php');
-dol_include_once('/datapolicy/class/datapolicy.class.php');
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
$idc = GETPOST('c', 'int');
$ids = GETPOST('s', 'int');
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 40d0616ad37..02a35deb70d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -154,7 +154,7 @@ if ($action == 'add')
if (! $error)
{
- $object->fk_soc = GETPOST("fk_soc", 'int');
+ $object->socid = GETPOST("socid", 'int');
$object->firstname = GETPOST("firstname", 'alpha');
$object->lastname = GETPOST("lastname", 'alpha');
$object->societe = GETPOST("societe", 'alpha');
@@ -164,7 +164,7 @@ if ($action == 'add')
$object->town = GETPOST("town", 'alpha');
$object->country_id = GETPOST('country_id', 'int');
$object->email = GETPOST('email', 'alpha');
- $object->date = $donation_date;
+ $object->date = $donation_date;
$object->note_private = GETPOST("note_private", 'none');
$object->note_public = GETPOST("note_public", 'none');
$object->public = GETPOST("public", 'alpha');
@@ -372,7 +372,7 @@ if ($action == 'create')
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print ' ';
}
print '' . "\n";
@@ -531,10 +531,10 @@ if (! empty($id) && $action == 'edit')
print "";
print "\n";
-if ( $object->fk_soc && ! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES) ) {
+if ( $object->socid && ! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES) ) {
$company=new Societe($db);
- $result=$company->fetch($object->fk_soc);
+ $result=$company->fetch($object->socid);
print '
'.$langs->trans("LinkedToDolibarrThirdParty").' '.$company->getNomUrl(1).' ';
} else {
@@ -693,10 +693,10 @@ if (! empty($id) && $action != 'edit')
print yn($object->public);
print '';
-if ($object->fk_soc) {
+if ($object->socid) {
$company=new Societe($db);
- $result=$company->fetch($object->fk_soc);
+ $result=$company->fetch($object->socid);
print '
'.$langs->trans("LinkedToDolibarrThirdParty").' '.$company->getNomUrl(1).' ';
} else {
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index b326c6f4959..de854ce806d 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2016 Laurent Destailleur
+/* Copyright (C) 2019 Thibault FOUCART
+ * Copyright (C) 2019 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ class Donations extends DolibarrApi
{
global $db, $conf;
$this->db = $db;
- $this->don = new Don($this->db);
+ $this->don = new Don($this->db);
}
/**
@@ -72,13 +72,13 @@ class Donations extends DolibarrApi
throw new RestException(404, 'Donation not found');
}
- if( ! DolibarrApi::_checkAccessToResource('commande', $this->don->id)) {
+ if( ! DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
// Add external contacts ids
- //$this->commande->contacts_ids = $this->don->liste_contact(-1,'external',1);
- //$this->commande->fetchObjectLinked();
+ //$this->don->contacts_ids = $this->don->liste_contact(-1,'external',1);
+ //$this->don->fetchObjectLinked();
return $this->_cleanObjectDatas($this->don);
}
@@ -87,14 +87,14 @@ class Donations extends DolibarrApi
/**
* List donations
*
- * Get a list of orders
+ * Get a list of donations
*
- * @param string $sortfield Sort field
- * @param string $sortorder Sort order
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
- * @param string $thirdparty_ids Thirdparty ids to filter orders of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
- * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+ * @param string $thirdparty_ids Thirdparty ids to filter orders of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
+ * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @return array Array of order objects
*
* @throws RestException
@@ -108,25 +108,14 @@ class Donations extends DolibarrApi
// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
- // If the internal user must only see his customers, force searching by him
- $search_sale = 0;
- if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
-
$sql = "SELECT t.rowid";
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) ) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
$sql.= " FROM ".MAIN_DB_PREFIX."don as t";
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-
$sql.= ' WHERE t.entity IN ('.getEntity('don').')';
- if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
- if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
- if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
- // Insert sale filter
- if ($search_sale > 0)
- {
- $sql .= " AND sc.fk_user = ".$search_sale;
- }
+ if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) ) $sql.= " AND t.fk_soc = sc.fk_soc";
+ if ($thirdparty_ids) $sql.= " AND t.fk_soc = ".$thirdparty_ids." ";
+
// Add sql filters
if ($sqlfilters)
{
@@ -151,7 +140,7 @@ class Donations extends DolibarrApi
dol_syslog("API Rest request");
$result = $db->query($sql);
-
+
if ($result)
{
$num = $db->num_rows($result);
@@ -160,21 +149,22 @@ class Donations extends DolibarrApi
while ($i < $min)
{
$obj = $db->fetch_object($result);
- $commande_static = new Commande($db);
- if($commande_static->fetch($obj->rowid)) {
+ $don_static = new Don($db);
+ if($don_static->fetch($obj->rowid)) {
// Add external contacts ids
- $commande_static->contacts_ids = $commande_static->liste_contact(-1, 'external', 1);
- $obj_ret[] = $this->_cleanObjectDatas($commande_static);
+ //$don_static->contacts_ids = $don_static->liste_contact(-1, 'external', 1);
+ $obj_ret[] = $this->_cleanObjectDatas($don_static);
}
$i++;
}
}
else {
- throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
+ throw new RestException(503, 'Error when retrieve donation list : '.$db->lasterror());
}
if( ! count($obj_ret)) {
- throw new RestException(404, 'No order found');
+ throw new RestException(404, 'No donation found');
}
+
return $obj_ret;
}
@@ -186,28 +176,28 @@ class Donations extends DolibarrApi
*/
function post($request_data = null)
{
- if(! DolibarrApiAccess::$user->rights->commande->creer) {
+ if(! DolibarrApiAccess::$user->rights->don->creer) {
throw new RestException(401, "Insuffisant rights");
}
// Check mandatory fields
$result = $this->_validate($request_data);
foreach($request_data as $field => $value) {
- $this->commande->$field = $value;
+ $this->don->$field = $value;
}
/*if (isset($request_data["lines"])) {
$lines = array();
foreach ($request_data["lines"] as $line) {
array_push($lines, (object) $line);
}
- $this->commande->lines = $lines;
+ $this->don->lines = $lines;
}*/
- if ($this->commande->create(DolibarrApiAccess::$user) < 0) {
- throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
+ if ($this->don->create(DolibarrApiAccess::$user) < 0) {
+ throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
}
- return $this->commande->id;
+ return $this->don->id;
}
/**
@@ -220,36 +210,30 @@ class Donations extends DolibarrApi
*/
function put($id, $request_data = null)
{
- if (! DolibarrApiAccess::$user->rights->commande->creer) {
+ if (! DolibarrApiAccess::$user->rights->don->creer) {
throw new RestException(401);
}
- $result = $this->commande->fetch($id);
+ $result = $this->don->fetch($id);
if (! $result) {
- throw new RestException(404, 'Order not found');
+ throw new RestException(404, 'Donation not found');
}
- if (! DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+ if (! DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
foreach($request_data as $field => $value) {
if ($field == 'id') continue;
- $this->commande->$field = $value;
+ $this->don->$field = $value;
}
- // Update availability
- if (!empty($this->commande->availability_id)) {
- if ($this->commande->availability($this->commande->availability_id) < 0)
- throw new RestException(400, 'Error while updating availability');
- }
-
- if ($this->commande->update(DolibarrApiAccess::$user) > 0)
+ if ($this->don->update(DolibarrApiAccess::$user) > 0)
{
return $this->get($id);
}
else
{
- throw new RestException(500, $this->commande->error);
+ throw new RestException(500, $this->don->error);
}
}
@@ -269,7 +253,7 @@ class Donations extends DolibarrApi
throw new RestException(404, 'Donation not found');
}
- if( ! DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
+ if( ! DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -309,10 +293,10 @@ class Donations extends DolibarrApi
*/
function validate($id, $idwarehouse = 0, $notrigger = 0)
{
- if(! DolibarrApiAccess::$user->rights->commande->creer) {
+ if(! DolibarrApiAccess::$user->rights->don->creer) {
throw new RestException(401);
}
- $result = $this->commande->fetch($id);
+ $result = $this->don->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Donation not found');
}
@@ -321,25 +305,25 @@ class Donations extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- $result = $this->commande->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
+ $result = $this->don->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
if ($result == 0) {
throw new RestException(304, 'Error nothing done. May be object is already validated');
}
if ($result < 0) {
- throw new RestException(500, 'Error when validating Order: '.$this->commande->error);
+ throw new RestException(500, 'Error when validating Order: '.$this->don->error);
}
- $result = $this->commande->fetch($id);
+ $result = $this->don->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Order not found');
}
- if( ! DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+ if( ! DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- $this->commande->fetchObjectLinked();
+ $this->don->fetchObjectLinked();
- return $this->_cleanObjectDatas($this->commande);
+ return $this->_cleanObjectDatas($this->don);
}
/**
@@ -372,12 +356,12 @@ class Donations extends DolibarrApi
*/
function _validate($data)
{
- $commande = array();
+ $don = array();
foreach (Orders::$FIELDS as $field) {
if (!isset($data[$field]))
throw new RestException(400, $field ." field missing");
- $commande[$field] = $data[$field];
+ $don[$field] = $data[$field];
}
- return $commande;
+ return $don;
}
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index f6c2ff1847c..f361299f83a 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -395,7 +395,7 @@ class Don extends CommonObject
$sql.= ", ".$conf->entity;
$sql.= ", ".price2num($this->amount);
$sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
- $sql.= ", '".$this->db->escape($this->fk_soc)."'";
+ $sql.= ", '".$this->db->escape($this->socid)."'";
$sql.= ", '".$this->db->escape($this->firstname)."'";
$sql.= ", '".$this->db->escape($this->lastname)."'";
$sql.= ", '".$this->db->escape($this->societe)."'";
@@ -644,7 +644,7 @@ class Don extends CommonObject
global $conf;
$sql = "SELECT d.rowid, d.datec, d.date_valid, d.tms as datem, d.datedon,";
- $sql.= " d.fk_soc,d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
+ $sql.= " d.fk_soc as socid,d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
$sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, d.email, d.phone, ";
$sql.= " d.phone_mobile, d.fk_projet as fk_project, d.model_pdf,";
$sql.= " p.ref as project_ref,";
@@ -672,40 +672,42 @@ class Don extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->ref = $obj->rowid;
- $this->datec = $this->db->jdate($obj->datec);
- $this->date_valid = $this->db->jdate($obj->date_valid);
- $this->datem = $this->db->jdate($obj->datem);
- $this->date = $this->db->jdate($obj->datedon);
- $this->fk_soc = $obj->fk_soc;
- $this->firstname = $obj->firstname;
- $this->lastname = $obj->lastname;
- $this->societe = $obj->societe;
- $this->statut = $obj->fk_statut;
- $this->address = $obj->address;
- $this->town = $obj->town;
- $this->zip = $obj->zip;
- $this->town = $obj->town;
- $this->country_id = $obj->fk_country;
- $this->country_code = $obj->country_code;
- $this->country = $obj->country;
- $this->country_olddata= $obj->country_olddata; // deprecated
- $this->email = $obj->email;
- $this->phone = $obj->phone;
- $this->phone_mobile = $obj->phone_mobile;
- $this->project = $obj->project_ref;
- $this->fk_projet = $obj->fk_project; // deprecated
- $this->fk_project = $obj->fk_project;
- $this->public = $obj->public;
- $this->modepaymentid = $obj->fk_payment;
- $this->modepaymentcode = $obj->payment_code;
- $this->modepayment = $obj->payment_label;
- $this->paid = $obj->paid;
- $this->amount = $obj->amount;
- $this->note_private = $obj->note_private;
- $this->note_public = $obj->note_public;
- $this->modelpdf = $obj->model_pdf;
+ $this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
+ $this->date_creation = $this->db->jdate($obj->datec);
+ $this->datec = $this->db->jdate($obj->datec);
+ $this->date_validation = $this->db->jdate($obj->date_valid);
+ $this->date_modification = $this->db->jdate($obj->datem);
+ $this->datem = $this->db->jdate($obj->datem);
+ $this->date = $this->db->jdate($obj->datedon);
+ $this->socid = $obj->socid;
+ $this->firstname = $obj->firstname;
+ $this->lastname = $obj->lastname;
+ $this->societe = $obj->societe;
+ $this->statut = $obj->fk_statut;
+ $this->address = $obj->address;
+ $this->town = $obj->town;
+ $this->zip = $obj->zip;
+ $this->town = $obj->town;
+ $this->country_id = $obj->fk_country;
+ $this->country_code = $obj->country_code;
+ $this->country = $obj->country;
+ $this->country_olddata = $obj->country_olddata; // deprecated
+ $this->email = $obj->email;
+ $this->phone = $obj->phone;
+ $this->phone_mobile = $obj->phone_mobile;
+ $this->project = $obj->project_ref;
+ $this->fk_projet = $obj->fk_project; // deprecated
+ $this->fk_project = $obj->fk_project;
+ $this->public = $obj->public;
+ $this->mode_reglement_id = $obj->fk_payment;
+ $this->mode_reglement_code= $obj->payment_code;
+ $this->mode_reglement = $obj->payment_label;
+ $this->paid = $obj->paid;
+ $this->amount = $obj->amount;
+ $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
+ $this->modelpdf = $obj->model_pdf;
// Retreive all extrafield
// fetch optionals attributes and labels
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 5a7b7ff2e42..c386327bea6 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -121,7 +121,7 @@ if (empty($reshook))
{
$action = '';
$object->fetch($id); // show shipment also after canceling modification
- }
+ }
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
@@ -784,8 +784,7 @@ if (empty($reshook))
$stockLocation="entl".$detail_entrepot->line_id;
$qty = "qtyl".$detail_entrepot->line_id;
$warehouse = GETPOST($stockLocation, 'int');
- if (!empty ($warehouse))
- {
+ if (!empty($warehouse)) {
$line->id = $detail_entrepot->line_id;
$line->entrepot_id = $warehouse;
$line->qty = GETPOST($qty, 'int');
@@ -800,8 +799,9 @@ if (empty($reshook))
}
}
}
- else // Product no predefined
+ else
{
+ // Product no predefined
$qty = "qtyl".$line_id;
$line->id = $line_id;
$line->qty = GETPOST($qty, 'int');
@@ -960,7 +960,7 @@ if ($action == 'create')
print '';
print '' . $langs->trans("Project") . ' ';
$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print ' ';
}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index eb4ca875448..987968e241f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -948,7 +948,7 @@ if ($action == 'create')
$numprojet=$formproject->select_projects($soc->id, $projectid, 'projectid');
if ($numprojet==0)
{
- print ' '.$langs->trans("AddProject").' ';
+ print ' '.$langs->trans("AddProject").' ';
}
print '';
}
@@ -961,7 +961,7 @@ if ($action == 'create')
$numcontrat=$formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1);
if ($numcontrat==0)
{
- print ' '.$langs->trans("AddContract").' ';
+ print ' '.$langs->trans("AddContract").' ';
}
print '';
}
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index de5744711ea..ef8baf8748f 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -173,7 +173,7 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
}
if (empty($dolibarr_main_db_host))
{
- print 'Dolibarr setup is not yet complete.
'."\n";
+ print '
'."\n";
die;
}
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 69e6ff160dc..4391d14ea3c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -185,8 +185,8 @@ class SupplierInvoices extends DolibarrApi
function post($request_data = null)
{
if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
- throw new RestException(401, "Insuffisant rights");
- }
+ throw new RestException(401, "Insuffisant rights");
+ }
// Check mandatory fields
$result = $this->_validate($request_data);
@@ -221,8 +221,8 @@ class SupplierInvoices extends DolibarrApi
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
- throw new RestException(401);
- }
+ throw new RestException(401);
+ }
$result = $this->invoice->fetch($id);
if( ! $result ) {
@@ -239,7 +239,7 @@ class SupplierInvoices extends DolibarrApi
}
if($this->invoice->update($id, DolibarrApiAccess::$user))
- return $this->get ($id);
+ return $this->get($id);
return false;
}
@@ -253,8 +253,8 @@ class SupplierInvoices extends DolibarrApi
function delete($id)
{
if(! DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
- throw new RestException(401);
- }
+ throw new RestException(401);
+ }
$result = $this->invoice->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Supplier invoice not found');
@@ -306,9 +306,9 @@ class SupplierInvoices extends DolibarrApi
throw new RestException(404, 'Invoice not found');
}
- if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
+ if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
if ($result == 0) {
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index b48635d3fd1..38c9ab9e200 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -190,8 +190,8 @@ class SupplierOrders extends DolibarrApi
function post($request_data = null)
{
if(! DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
- throw new RestException(401, "Insuffisant rights");
- }
+ throw new RestException(401, "Insuffisant rights");
+ }
// Check mandatory fields
$result = $this->_validate($request_data);
@@ -226,8 +226,8 @@ class SupplierOrders extends DolibarrApi
function put($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->fournisseur->commande->creer) {
- throw new RestException(401);
- }
+ throw new RestException(401);
+ }
$result = $this->order->fetch($id);
if( ! $result ) {
@@ -244,7 +244,7 @@ class SupplierOrders extends DolibarrApi
}
if($this->order->update($id, DolibarrApiAccess::$user))
- return $this->get ($id);
+ return $this->get($id);
return false;
}
@@ -257,20 +257,19 @@ class SupplierOrders extends DolibarrApi
*/
function delete($id)
{
- if(! DolibarrApiAccess::$user->rights->fournisseur->commande->supprimer) {
- throw new RestException(401);
- }
+ if (! DolibarrApiAccess::$user->rights->fournisseur->commande->supprimer) {
+ throw new RestException(401);
+ }
$result = $this->order->fetch($id);
- if( ! $result ) {
+ if ( ! $result) {
throw new RestException(404, 'Supplier order not found');
}
- if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, '', 'commande')) {
+ if ( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, '', 'commande')) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- if( $this->order->delete(DolibarrApiAccess::$user) < 0)
- {
+ if ( $this->order->delete(DolibarrApiAccess::$user) < 0) {
throw new RestException(500);
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8233d6a2302..05b6754bc5d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1700,29 +1700,33 @@ class FactureFournisseur extends CommonInvoice
$this->line->fk_facture_fourn=$this->id;
//$this->line->label=$label; // deprecated
$this->line->desc=$desc;
- $this->line->qty= ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty); // For credit note, quantity is always positive and unit price negative
$this->line->ref_supplier=$ref_supplier;
+ $this->line->qty= ($this->type==self::TYPE_CREDIT_NOTE?abs($qty):$qty); // For credit note, quantity is always positive and unit price negative
+ $this->line->subprice= ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
+
$this->line->vat_src_code=$vat_src_code;
$this->line->tva_tx=$txtva;
$this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
$this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
$this->line->localtax1_type = $localtaxes_type[0];
$this->line->localtax2_type = $localtaxes_type[2];
+
+ $this->line->total_ht= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht); // For credit note and if qty is negative, total is negative
+ $this->line->total_tva= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
+ $this->line->total_localtax1=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1);
+ $this->line->total_localtax2=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2);
+ $this->line->total_ttc= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+
$this->line->fk_product=$fk_product;
$this->line->product_type=$type;
$this->line->remise_percent=$remise_percent;
- $this->line->subprice= ($this->type==self::TYPE_CREDIT_NOTE?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
$this->line->date_start=$date_start;
$this->line->date_end=$date_end;
$this->line->ventil=$ventil;
$this->line->rang=$rang;
$this->line->info_bits=$info_bits;
- $this->line->total_ht= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht); // For credit note and if qty is negative, total is negative
- $this->line->total_tva= $total_tva;
- $this->line->total_localtax1=$total_localtax1;
- $this->line->total_localtax2=$total_localtax2;
- $this->line->total_ttc= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
+
$this->line->special_code=$this->special_code;
$this->line->fk_parent_line=$this->fk_parent_line;
$this->line->origin=$this->origin;
@@ -1891,11 +1895,11 @@ class FactureFournisseur extends CommonInvoice
$line->localtax2_tx = $txlocaltax2;
$line->localtax1_type = $localtaxes_type[0];
$line->localtax2_type = $localtaxes_type[2];
- $line->total_ht = $total_ht;
- $line->total_tva = $total_tva;
+ $line->total_ht = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht);
+ $line->total_tva = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva);
$line->total_localtax1 = $total_localtax1;
$line->total_localtax2 = $total_localtax2;
- $line->total_ttc = $total_ttc;
+ $line->total_ttc = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc);
$line->fk_product = $idproduct;
$line->product_type = $product_type;
$line->info_bits = $info_bits;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 353fe5273f1..644ebd79347 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1496,7 +1496,7 @@ if ($action=='create')
});
';
}
- print '
'.$langs->trans("AddThirdParty").' ';
+ print '
'.$langs->trans("AddThirdParty").' ';
}
print '';
@@ -1558,7 +1558,7 @@ if ($action=='create')
$langs->load('projects');
print '
' . $langs->trans('Project') . ' ';
$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 257750559a1..fab8aa705de 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -499,7 +499,7 @@ if ($id > 0 || ! empty($ref)) {
$sql .= " WHERE l.fk_commande = " . $object->id;
if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
$sql .= " AND l.product_type = 0";
- $sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
+ $sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent, p.fk_default_warehouse"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
$sql .= " ORDER BY p.ref, p.label";
$resql = $db->query($sql);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b85099d5a15..70407661d52 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1755,7 +1755,7 @@ if ($action == 'create')
});
';
}
- print '
'.$langs->trans("AddThirdParty").' ';
+ print '
'.$langs->trans("AddThirdParty").' ';
}
print '';
@@ -3036,8 +3036,13 @@ else
print '
';
}
+ $discount = new DiscountAbsolute($db);
+ $result = $discount->fetch(0, 0, $object->id);
+
// Reopen a standard paid invoice
- if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT) && ($object->statut == 2 || $object->statut == 3)) // A paid invoice (partially or completely)
+ if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT
+ || ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
+ && ($object->statut == 2 || $object->statut == 3)) // A paid invoice (partially or completely)
{
if (! $facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer) // Not replaced by another invoice
{
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index bfe7fb4df85..4d5a3d32c78 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -368,7 +368,7 @@ if (! $search_all)
$sql.= " typent.code,";
$sql.= " state.code_departement, state.nom,";
$sql.= ' country.code,';
- $sql.= " p.rowid, p.ref";
+ $sql.= " p.rowid, p.ref, p.title";
foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
{
diff --git a/htdocs/index.php b/htdocs/index.php
index 9217af0f4c3..bc918ab76f4 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -118,7 +118,9 @@ if (empty($user->societe_id))
$boxstat.='
';
$boxstat.='
';
$boxstat.='';
- $boxstat.=''.$langs->trans("DolibarrStateBoard").' ';
+ $boxstat.='';
+ $boxstat.=''.$langs->trans("DolibarrStateBoard").'
';
+ $boxstat.=' ';
$boxstat.=' ';
$boxstat.='';
@@ -530,10 +532,20 @@ $boxwork='';
$boxwork.='';
$boxwork.='
'."\n";
$boxwork.='';
-$boxwork.=''.$langs->trans("DolibarrWorkBoard").' ';
+$boxwork.=''.$langs->trans("DolibarrWorkBoard").'
';
+if ($showweather)
+{
+ if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
+ else $text=$langs->transnoentitiesnoconv("NoItemLate");
+ $text.='. '.$langs->transnoentitiesnoconv("LateDesc");
+ //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
+ $options='height="24px" style="float: right"';
+ $boxwork.=showWeather($totallate, $text, $options, 'inline-block valignmiddle');
+}
+$boxwork.=' '."\n";
-if ($showweather)
+/*if ($showweather)
{
$boxwork.='';
$boxwork.='';
@@ -546,7 +558,7 @@ if ($showweather)
$boxwork.=showWeather($totallate, $text, $options);
$boxwork.=' ';
$boxwork.=' ';
-}
+}*/
// Show dashboard
$nbworkboardempty=0;
@@ -694,9 +706,10 @@ $db->close();
* @param int $totallate Nb of element late
* @param string $text Text to show on logo
* @param string $options More parameters on img tag
+ * @param string $morecss More CSS
* @return string Return img tag of weather
*/
-function showWeather($totallate, $text, $options)
+function showWeather($totallate, $text, $options, $morecss = '')
{
global $conf;
@@ -723,10 +736,10 @@ function showWeather($totallate, $text, $options)
$level3=$conf->global->{$used_conf.'3'};
}
- if ($totallate <= $level0) $out.=img_weather($text, 'weather-clear.png', $options);
- elseif ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text, 'weather-few-clouds.png', $options);
- elseif ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text, 'weather-clouds.png', $options);
- elseif ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text, 'weather-many-clouds.png', $options);
- elseif ($totallate > $level3) $out.=img_weather($text, 'weather-storm.png', $options);
+ if ($totallate <= $level0) $out.=img_weather($text, 'weather-clear.png', $options, 0, $morecss);
+ elseif ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text, 'weather-few-clouds.png', $options, 0, $morecss);
+ elseif ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text, 'weather-clouds.png', $options, 0, $morecss);
+ elseif ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text, 'weather-many-clouds.png', $options, 0, $morecss);
+ elseif ($totallate > $level3) $out.=img_weather($text, 'weather-storm.png', $options, 0, $morecss);
return $out;
}
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index 9012448959c..575573c41c9 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -268,5 +268,15 @@ UPDATE llx_const set name = 'PRELEVEMENT_END_TO_END' where name = 'END_TO_END';
UPDATE llx_const set name = 'PRELEVEMENT_USTRD' where name = 'USTRD';
+-- Delete duplicate accounting account, but only if not used
+DROP TABLE tmp_llx_accouting_account;
+CREATE TABLE tmp_llx_accouting_account AS SELECT MIN(rowid) as MINID, account_number, entity, fk_pcg_version, count(*) AS NB FROM llx_accounting_account group BY account_number, entity, fk_pcg_version HAVING count(*) >= 2 order by account_number, entity, fk_pcg_version;
+--SELECT * from tmp_llx_accouting_account;
+DELETE from llx_accounting_account where rowid in (select minid from tmp_llx_accouting_account where minid NOT IN (SELECT fk_code_ventilation from llx_facturedet) AND minid NOT IN (SELECT fk_code_ventilation from llx_facture_fourn_det) AND minid NOT IN (SELECT fk_code_ventilation from llx_expensereport_det));
+
+
ALTER TABLE llx_accounting_account DROP INDEX uk_accounting_account;
ALTER TABLE llx_accounting_account ADD UNIQUE INDEX uk_accounting_account (account_number, entity, fk_pcg_version);
+
+
+
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 6e188240a43..fe7cdb9faf6 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -94,13 +94,11 @@ ALTER TABLE llx_don ADD COLUMN fk_soc integer NULL;
ALTER TABLE llx_payment_various ADD COLUMN subledger_account varchar(32);
-
ALTER TABLE llx_prelevement_facture_demande ADD COLUMN entity integer(11);
ALTER TABLE llx_prelevement_facture_demande ADD COLUMN sourcetype varchar(32);
ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_id varchar(128) NULL;
ALTER TABLE llx_prelevement_facture_demande ADD COLUMN ext_payment_site varchar(128) NULL;
-
-- Fix if table exists
ALTER TABLE llx_c_units DROP INDEX uk_c_units_code;
ALTER TABLE llx_c_units ADD COLUMN scale integer;
@@ -119,7 +117,6 @@ CREATE TABLE llx_c_units(
ALTER TABLE llx_c_units ADD UNIQUE uk_c_units_code(code);
-
INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('T', '3','WeightUnitton','T', 'weight', 1);
INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('KG', '0','WeightUnitkg','Kg', 'weight', 1);
INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('G', '-3','WeightUnitg','g', 'weight', 1);
@@ -162,3 +159,73 @@ INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VAL
-- Default Warehouse id for a user
ALTER TABLE llx_user ADD COLUMN fk_warehouse INTEGER NULL;
+
+-- Save informations for online / API shopping and push to invoice
+ALTER TABLE llx_commande ADD COLUMN module_source varchar(32);
+ALTER TABLE llx_commande ADD COLUMN pos_source varchar(32);
+
+
+ALTER TABLE llx_societe ADD COLUMN linkedin varchar(255) after whatsapp;
+ALTER TABLE llx_socpeople ADD COLUMN linkedin varchar(255) after whatsapp;
+ALTER TABLE llx_adherent ADD COLUMN linkedin varchar(255) after whatsapp;
+ALTER TABLE llx_user ADD COLUMN linkedin varchar(255) after whatsapp;
+
+
+
+
+CREATE TABLE llx_bom_bom(
+ -- BEGIN MODULEBUILDER FIELDS
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ ref varchar(128) NOT NULL,
+ label varchar(255),
+ description text,
+ note_public text,
+ note_private text,
+ date_creation datetime NOT NULL,
+ tms timestamp NOT NULL,
+ fk_user_creat integer NOT NULL,
+ fk_user_modif integer,
+ import_key varchar(14),
+ status integer NOT NULL,
+ fk_product integer,
+ qty double(24,8)
+ -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+create table llx_bom_bom_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
+CREATE TABLE llx_bom_bomline(
+ -- BEGIN MODULEBUILDER FIELDS
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ description text,
+ import_key varchar(14),
+ qty double(24,8),
+ fk_product integer,
+ fk_bom integer,
+ rank integer NOT NULL
+ -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+create table llx_bom_bomline_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_rowid (rowid);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_ref (ref);
+ALTER TABLE llx_bom_bom ADD CONSTRAINT llx_bom_bom_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_status (status);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_fk_product (fk_product);
+
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_rowid (rowid);
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_product (fk_product);
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_bom (fk_bom);
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index f54523d2230..387f8e159ec 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -376,6 +376,16 @@ update llx_bank_url as bu set url_id = (select e.fk_user_author from tmp_bank_ur
drop table tmp_bank_url_expense_user;
+-- Delete duplicate accounting account, but only if not used
+DROP TABLE tmp_llx_accouting_account;
+CREATE TABLE tmp_llx_accouting_account AS SELECT MIN(rowid) as MINID, account_number, entity, fk_pcg_version, count(*) AS NB FROM llx_accounting_account group BY account_number, entity, fk_pcg_version HAVING count(*) >= 2 order by account_number, entity, fk_pcg_version;
+--SELECT * from tmp_llx_accouting_account;
+DELETE from llx_accounting_account where rowid in (select minid from tmp_llx_accouting_account where minid NOT IN (SELECT fk_code_ventilation from llx_facturedet) AND minid NOT IN (SELECT fk_code_ventilation from llx_facture_fourn_det) AND minid NOT IN (SELECT fk_code_ventilation from llx_expensereport_det));
+
+ALTER TABLE llx_accounting_account DROP INDEX uk_accounting_account;
+ALTER TABLE llx_accounting_account ADD UNIQUE INDEX uk_accounting_account (account_number, entity, fk_pcg_version);
+
+
-- VMYSQL4.1 update llx_projet_task_time set task_datehour = task_date where task_datehour < task_date or task_datehour > DATE_ADD(task_date, interval 1 day);
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index ede4de2e487..588fb323dae 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -51,6 +51,7 @@ create table llx_adherent
skype varchar(255),
twitter varchar(255), --
facebook varchar(255), --
+ linkedin varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.key.sql b/htdocs/install/mysql/tables/llx_bom_bom.key.sql
new file mode 100644
index 00000000000..72631851e1b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bom.key.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_rowid (rowid);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_ref (ref);
+ALTER TABLE llx_bom_bom ADD CONSTRAINT llx_bom_bom_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_status (status);
+ALTER TABLE llx_bom_bom ADD INDEX idx_bom_bom_fk_product (fk_product);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_bom_bom ADD UNIQUE INDEX uk_bom_bom_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_bom_bom ADD CONSTRAINT llx_bom_bom_fk_field FOREIGN KEY (fk_field) REFERENCES llx_bom_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
new file mode 100644
index 00000000000..bb8da0726bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -0,0 +1,34 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_bom_bom(
+ -- BEGIN MODULEBUILDER FIELDS
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ ref varchar(128) NOT NULL,
+ label varchar(255),
+ description text,
+ note_public text,
+ note_private text,
+ date_creation datetime NOT NULL,
+ tms timestamp NOT NULL,
+ fk_user_creat integer NOT NULL,
+ fk_user_modif integer,
+ import_key varchar(14),
+ status integer NOT NULL,
+ fk_product integer,
+ qty double(24,8)
+ -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
new file mode 100644
index 00000000000..2f748847455
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+create table llx_bom_bom_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.key.sql b/htdocs/install/mysql/tables/llx_bom_bomline.key.sql
new file mode 100644
index 00000000000..89c65f78644
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bomline.key.sql
@@ -0,0 +1,26 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_rowid (rowid);
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_product (fk_product);
+ALTER TABLE llx_bom_bomline ADD INDEX idx_bom_bomline_fk_bom (fk_bom);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_bom_bomline ADD UNIQUE INDEX uk_bom_bomline_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_bom_bomline ADD CONSTRAINT llx_bom_bomline_fk_field FOREIGN KEY (fk_field) REFERENCES llx_bom_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.sql b/htdocs/install/mysql/tables/llx_bom_bomline.sql
new file mode 100644
index 00000000000..d1a958e9633
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bomline.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_bom_bomline(
+ -- BEGIN MODULEBUILDER FIELDS
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ description text,
+ import_key varchar(14),
+ qty double(24,8),
+ fk_product integer,
+ fk_bom integer,
+ rank integer NOT NULL
+ -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
new file mode 100644
index 00000000000..a81715d0184
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see http://www.gnu.org/licenses/.
+
+create table llx_bom_bomline_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index d0522f7e5e3..35b6798e77a 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -57,6 +57,8 @@ create table llx_commande
model_pdf varchar(255),
last_main_doc varchar(255), -- relative filepath+filename of last main generated document
+ module_source varchar(32), -- name of module when order generated by a dedicated module (POS, ...)
+ pos_source varchar(32), -- name of POS station when order is generated by a POS module
facture tinyint default 0,
fk_account integer, -- bank account
fk_currency varchar(3), -- currency code
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 3887980d718..cfcb672400b 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -35,6 +35,5 @@ create table llx_prelevement_facture_demande
number varchar(255),
cle_rib varchar(5),
ext_payment_id varchar(128),
- ext_payment_site varchar(128),
-
+ ext_payment_site varchar(128)
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 6225ae416e8..ed4919c3fc5 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -54,6 +54,7 @@ create table llx_societe
skype varchar(255), --
twitter varchar(255), --
facebook varchar(255), --
+ linkedin varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 00456e3ece6..4ed401e39da 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -46,6 +46,7 @@ create table llx_socpeople
skype varchar(255),
twitter varchar(255), --
facebook varchar(255), --
+ linkedin varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index cb9bf35ccd0..0beffd73428 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -58,6 +58,7 @@ create table llx_user
skype varchar(255),
twitter varchar(255), --
facebook varchar(255), --
+ linkedin varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 5027e976a4b..1229ace57ee 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4470,6 +4470,7 @@ function migrate_delete_old_files($db, $langs, $conf)
'/societe/class/api_contact.class.php',
'/societe/class/api_thirdparty.class.php',
'/support/online.php',
+ '/takepos/class/actions_takepos.class.php'
);
foreach ($filetodeletearray as $filetodelete) {
diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index e4b07918378..53393c74233 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -25,6 +25,5 @@ Module25Desc=إدارة أوامر الشراء
Module700Name=تبرعات
Module1780Name=الأوسمة/التصنيفات
Permission81=قراءة أوامر الشراء
-Audit=Audit
LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit . Warning, this feature can consume a large amount of data in database.
NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 8a51e29cb85..e3be90a6cc4 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -33,7 +33,6 @@ ConfirmClone=Klonen/Duplizieren - Optionen:
Of=Von
Search=Suche
SearchOf=Suche
-Upload=Upload
PasswordRetype=Geben Sie das Passwort erneut ein
DateStart=Start-Datum
DateEnd=End-Datum
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index d5046722e24..6f2ae713012 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -35,7 +35,6 @@ ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to
MeasuringUnit=Measurement unit
MAIN_MAIL_AUTOCOPY_TO=Copy (Cc) all sent emails to
ModuleFamilyCrm=Customer Relations Management (CRM)
-ModuleFamilyProducts=Product Management (PM)
ModuleFamilyHr=Human Resources Management (HR)
ModuleFamilyTechnic=Multi-module tools
ThisIsProcessToFollow=These are steps to process:
@@ -56,9 +55,6 @@ FollowingSubstitutionKeysCanBeUsed=%s .
PrintsheetForOneBarCode=Print several labels for one barcode
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 86c510dfe00..d91ff478a19 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -99,6 +99,7 @@ MenuProductsAccounts=Product accounts
MenuClosureAccounts=Closure accounts
ProductsBinding=Products accounts
Ventilation=Binding to accounts
+Binding=Binding to accounts
CustomersVentilation=Customer invoice binding
SuppliersVentilation=Vendor invoice binding
ExpenseReportsVentilation=Expense report binding
@@ -154,7 +155,8 @@ ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+
ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
@@ -211,6 +213,7 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
ListAccounts=List of the accounting accounts
UnknownAccountForThirdparty=Unknown third-party account. We will use %s
UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
PaymentsNotLinkedToProduct=Payment not linked to any product / service
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 87766554735..477f611bf39 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -904,13 +904,13 @@ DictionaryRevenueStamp=Amount of tax stamps
DictionaryPaymentConditions=Payment Terms
DictionaryPaymentModes=Payment Modes
DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Type of website pages/containers
+DictionaryTypeOfContainer=Website - Type of website pages/containers
DictionaryEcotaxe=Ecotax (WEEE)
DictionaryPaperFormat=Paper formats
DictionaryFormatCards=Card formats
DictionaryFees=Expense report - Types of expense report lines
DictionarySendingMethods=Shipping methods
-DictionaryStaff=No. of Employees
+DictionaryStaff=Number of Employees
DictionaryAvailability=Delivery delay
DictionaryOrderMethods=Ordering methods
DictionarySource=Origin of proposals/orders
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 9f7975dcad9..17853434ea9 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -316,6 +316,8 @@ InvoiceDateCreation=Invoice creation date
InvoiceStatus=Invoice status
InvoiceNote=Invoice note
InvoicePaid=Invoice paid
+OrderBilled=Order billed
+DonationPaid=Donation paid
PaymentNumber=Payment number
RemoveDiscount=Remove discount
WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index db9eec32831..78b03ea8caf 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -72,7 +72,7 @@ BoxSuppliersOrdersPerMonth=Vendor Orders per month
BoxProposalsPerMonth=Proposals per month
NoTooLowStockProducts=No products are under the low stock limit
BoxProductDistribution=Products/Services Distribution
-BoxProductDistributionFor=Distribution of %s by %s
+BoxProductDistributionFor=%s by %s
BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f93de815d17..972712edeea 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -492,6 +492,8 @@ Drafts=Drafts
StatusInterInvoiced=Invoiced
Validated=Validated
Opened=Open
+OpenAll=Open (All)
+ClosedAll=Closed (All)
New=New
Discount=Discount
Unknown=Unknown
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 72a3cfe93f2..6366e93e375 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -27,9 +27,9 @@ Permission56003=Delete tickets
Permission56004=Manage tickets
Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
-TicketDictType=Tickets type
-TicketDictCategory=Tickets analytic code
-TicketDictSeverity=Tickets severity
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
TicketTypeShortBUGHARD=Dysfonctionnement matériel
TicketTypeShortCOM=Commercial question
@@ -123,13 +123,14 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
TicketNumberingModules=Tickets numbering module
TicketNotifyTiersAtCreation=Notify third party at creation
+TicketGroup=Group
#
# Index & list page
#
TicketsIndex=Ticket - home
TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list which are assigned to current user
+TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
NoTicketsFound=No ticket found
TicketViewAllTickets=View all tickets
TicketViewNonClosedOnly=View only open tickets
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 93ee3101ef4..ec427601415 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -931,7 +931,6 @@ FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descri
FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing)
FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario
FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> correo electrónico)
-OSCommerceTestKo2=La conexión al servidor '%s' con el usuario '%s' falló.
StockSetup=Configuración del módulo de stock
MenuDeleted=Menú borrado
NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 9bb6dd7f295..9dbe998903c 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -313,7 +313,6 @@ MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
-EMail=Email
NoEMail=Sin correo electrónico
FollowingConstantsWillBeSubstituted=Las siguientes constantes se reemplazarán por el valor correspondiente.
BackToList=Volver a la lista
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 4da30a203a0..1ee4ce793e6 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -975,7 +975,6 @@ FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descri
FCKeditorForMailing= WYSIWIG creación / edición para eMailings masivos (Herramientas->eMailing)
FCKeditorForUserSignature=WYSIWIG creación / edición de firma de usuario
FCKeditorForMail=WYSIWIG Creación / edición para todo el correo (excepto Herramientas->eMailing)
-OSCommerceTestKo2=Conexión al servidor '%s' con el usuario '%s' falló.
StockSetup=Configuración del módulo de stock/inventario
NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
Menu=Selección del menú
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index d391ac58b14..4f2591c0c42 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -342,7 +342,6 @@ MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
-EMail=Correo electrónico
NoEMail=Sin correo electrónico
Email=Correo electrónico
NotRead=No leer
diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
index 8b731814285..0d6b013ca18 100644
--- a/htdocs/langs/es_HN/main.lang
+++ b/htdocs/langs/es_HN/main.lang
@@ -2,26 +2,20 @@
DIRECTION=ltr
FONTFORPDF=helvetica
FONTSIZEFORPDF=10
-SeparatorDecimal=,
+SeparatorDecimal=.
SeparatorThousand=None
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
-AmountVAT=Importe ISV
-TotalVAT=Total ISV
-HT=Sin ISV
-TTC=ISV incluido
-VAT=ISV
-VATRate=Tasa ISV
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 5d9a6b2fcda..aa4bac2bdb1 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -182,7 +182,6 @@ FeatureNotYetSupported=Característica aún no soportada
SendByMail=Enviar por correo electrónico
MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
-EMail=Email
NoEMail=Sin correo electrónico
FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazadas con el valor correspondiente.
Refresh=Actualizar
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index c7466f9df38..6776c458708 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -99,7 +99,6 @@ MonthVeryShort09=D
NbOfObjectReferers=Nombre d'articles connexes
Referers=Articles connexes
SendAcknowledgementByMail=Envoyer un email de confirmation
-EMail=Courriel
ValueIsNotValid=La valeur n'est pas valide
RecordsModified=%s enregistrement modifié
RecordsDeleted=%s enregistrement(s) supprimé(s)
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 476298a9206..c305c0b17a8 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -316,6 +316,8 @@ InvoiceDateCreation=Date création facture
InvoiceStatus=Statut facture
InvoiceNote=Note facture
InvoicePaid=Facture payée
+OrderBilled=Commande facturée
+DonationPaid=Don payé
PaymentNumber=Numéro paiement
RemoveDiscount=Supprimer remise
WatermarkOnDraftBill=Filigrane sur les brouillons de factures (aucun si vide)
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index a2b29b577fb..fa4e5366ac0 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -27,9 +27,9 @@ Permission56003=Supprimer tickets
Permission56004=Gérer les tickets
Permission56005=Voir les tickets de tous les tiers (sauf pour les utilisateurs externes, toujours limité au tiers dont ils dépendent)
-TicketDictType=Type de ticket
-TicketDictCategory=Catégories de tickets
-TicketDictSeverity=Sévérité des tickets
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Sévérités
TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
TicketTypeShortBUGHARD=Dysfonctionnement matériel
TicketTypeShortCOM=Question commerciale
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index ed1f3794eec..3a6fbb39347 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1016,8 +1016,6 @@ FCKeditorForProduct=Criação/edição do WYSIWIG nas descrições de produtos/
FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
-OSCommerceTestOk=Conexão para o servidor '%s' no banco de dados '%s' com o usuário '%s' foi bem sucedida.
-OSCommerceTestKo2=Conexão ao servidor '%s' com o usuário '%s' falhou.
MenuDeleted=Menu Deletado
NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
NewMenu=Novo Menu
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bde3e8a02a7..1f0ff983c7d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1820,7 +1820,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
print '
';
@@ -198,7 +199,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
print '
';
print '
';
print ''.$langs->trans("Categories").' ';
+ print ' ';
$sql = "SELECT c.label, count(*) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -258,7 +259,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
}
}
print ' '.$langs->trans("Total").' ';
+ print ' '.$langs->trans("Total").' ';
print $total;
print '
';
@@ -356,15 +357,15 @@ if ($result)
$objp->price = $price_result;
}
}
- print '
';
+ print ' ';
if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
else print price($objp->price).' '.$langs->trans("HT");
print ' ';
}
- print '
';
+ print ' ';
print $product_static->LibStatut($objp->tosell, 3, 0);
print " ";
- print '
';
+ print ' ';
print $product_static->LibStatut($objp->tobuy, 3, 1);
print " ";
print "
';
if ($product_type==0)
- print ''.$langs->trans("ProductSellByQuarterHT").' ';
+ print ''.$langs->trans("ProductSellByQuarterHT").' ';
else
- print ''.$langs->trans("ServiceSellByQuarterHT").' ';
- print ''.$langs->trans("Quarter1").' ';
- print ''.$langs->trans("Quarter2").' ';
- print ''.$langs->trans("Quarter3").' ';
- print ''.$langs->trans("Quarter4").' ';
- print ''.$langs->trans("Total").' ';
+ print ''.$langs->trans("ServiceSellByQuarterHT").' ';
+ print ''.$langs->trans("Quarter1").' ';
+ print ''.$langs->trans("Quarter2").' ';
+ print ''.$langs->trans("Quarter3").' ';
+ print ''.$langs->trans("Quarter4").' ';
+ print ''.$langs->trans("Total").' ';
print ''.$tmpyear.' ';
- print ''.price($trim1).' ';
- print ''.price($trim2).' ';
- print ''.price($trim3).' ';
- print ''.price($trim4).' ';
- print ''.price($trim1+$trim2+$trim3+$trim4).' ';
+ print ''.$tmpyear.' ';
+ print ''.price($trim1).' ';
+ print ''.price($trim2).' ';
+ print ''.price($trim3).' ';
+ print ''.price($trim4).' ';
+ print ''.price($trim1+$trim2+$trim3+$trim4).' ';
print ''.$tmpyear.' ';
- print ''.price($trim1).' ';
- print ''.price($trim2).' ';
- print ''.price($trim3).' ';
- print ''.price($trim4).' ';
- print ''.price($trim1+$trim2+$trim3+$trim4).' ';
+ print ''.$tmpyear.' ';
+ print ''.price($trim1).' ';
+ print ''.price($trim2).' ';
+ print ''.price($trim3).' ';
+ print ''.price($trim4).' ';
+ print ''.price($trim1+$trim2+$trim3+$trim4).' ';
print '';
if (! empty($arrayfields['p.ref']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['pfp.ref_fourn']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['p.label']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
// Type
if (! empty($arrayfields['p.fk_product_type']['checked']))
{
- print '';
+ print ' ';
$array=array('-1'=>' ', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
print $form->selectarray('search_type', $array, $search_type);
print ' ';
@@ -555,7 +555,7 @@ if ($resql)
// Sell price
if (! empty($arrayfields['p.sellprice']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
// Minimum buying Price
@@ -623,17 +623,17 @@ if ($resql)
}
if (! empty($arrayfields['p.tosell']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray('search_tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')), $search_tosell, 1);
print ' ';
}
if (! empty($arrayfields['p.tobuy']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray('search_tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')), $search_tobuy, 1);
print ' ';
}
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -641,39 +641,81 @@ if ($resql)
print ' ';
print '';
- if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['pfp.ref_fourn']['checked'])) print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['p.label']['checked'])) print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['p.fk_product_type']['checked'])) print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['p.barcode']['checked'])) print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
- if ((string) $type == '1' && ! empty($arrayfields['p.duration']['checked'])) print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"], "p.duration", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.sellprice']['checked'])) print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.minbuyprice']['checked'])) print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.numbuyprice']['checked'])) print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.pmp']['checked'])) print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.seuil_stock_alerte']['checked'])) print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.desiredstock']['checked'])) print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.stock']['checked'])) print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"], "p.stock", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['stock_virtual']['checked'])) print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.tobatch']['checked'])) print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"], "p.tobatch", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.ref']['checked'])) {
+ print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['pfp.ref_fourn']['checked'])) {
+ print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.label']['checked'])) {
+ print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.fk_product_type']['checked'])) {
+ print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.barcode']['checked'])) {
+ print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
+ }
+ if ((string) $type == '1' && ! empty($arrayfields['p.duration']['checked'])) {
+ print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"], "p.duration", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['p.sellprice']['checked'])) {
+ print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.minbuyprice']['checked'])) {
+ print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.numbuyprice']['checked'])) {
+ print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.pmp']['checked'])) {
+ print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
+ print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.desiredstock']['checked'])) {
+ print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.stock']['checked'])) {
+ print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"], "p.stock", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['stock_virtual']['checked'])) {
+ print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.tobatch']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"], "p.tobatch", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['p.accountancy_code_sell']['checked'])) {
+ print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.accountancy_code_buy']['checked'])) {
+ print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
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.tosell']['checked'])) print_liste_field_titre($arrayfields['p.tosell']['label'], $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['p.tobuy']['checked'])) print_liste_field_titre($arrayfields['p.tobuy']['label'], $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
- print " \n";
+ if (! empty($arrayfields['p.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['p.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['p.tosell']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tosell']['label'], $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['p.tobuy']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tobuy']['label'], $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ print "\n";
- $product_static=new Product($db);
- $product_fourn =new ProductFournisseur($db);
+ $product_static = new Product($db);
+ $product_fourn = new ProductFournisseur($db);
$i = 0;
$totalarray=array();
@@ -776,7 +818,7 @@ if ($resql)
// Duration
if ((string) $type == '1' && ! empty($arrayfields['p.duration']['checked']))
{
- print '';
+ print ' ';
if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration))
{
@@ -842,7 +884,7 @@ if ($resql)
// Number of buy prices
if (! empty($arrayfields['p.numbuyprice']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->tobuy)
{
if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0)
@@ -857,7 +899,7 @@ if ($resql)
// WAP
if (! empty($arrayfields['p.pmp']['checked']))
{
- print ' ';
+ print ' ';
print price($product_static->pmp, 1, $langs);
print ' ';
}
@@ -865,7 +907,7 @@ if ($resql)
// Limit alert
if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))
{
- print '';
+ print ' ';
if ($obj->fk_product_type != 1)
{
print $obj->seuil_stock_alerte;
@@ -876,7 +918,7 @@ if ($resql)
// Desired stock
if (! empty($arrayfields['p.desiredstock']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->fk_product_type != 1)
{
print $obj->desiredstock;
@@ -887,7 +929,7 @@ if ($resql)
// Stock real
if (! empty($arrayfields['p.stock']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->fk_product_type != 1)
{
if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
@@ -899,7 +941,7 @@ if ($resql)
// Stock virtual
if (! empty($arrayfields['stock_virtual']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->fk_product_type != 1)
{
if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
@@ -911,7 +953,7 @@ if ($resql)
// Lot/Serial
if (! empty($arrayfields['p.tobatch']['checked']))
{
- print ' ';
+ print ' ';
print yn($obj->tobatch);
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -937,7 +979,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['p.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($obj->date_creation, 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -945,7 +987,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['p.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($obj->date_update, 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -954,7 +996,7 @@ if ($resql)
// Status (to sell)
if (! empty($arrayfields['p.tosell']['checked']))
{
- print '';
+ print ' ';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
} else {
@@ -966,7 +1008,7 @@ if ($resql)
// Status (to buy)
if (! empty($arrayfields['p.tobuy']['checked']))
{
- print ' ';
+ print ' ';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
} else {
@@ -976,7 +1018,7 @@ if ($resql)
if (! $i) $totalarray['nbfield']++;
}
// Action
- print ' ';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 897763f4d91..8efbf7667ba 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -163,7 +163,7 @@ print " ";
print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'p.fk_product_type', '', $param, '', $sortfield, $sortorder);
print_liste_field_titre('Label', $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre('NbOfQtyInProposals', $_SERVER["PHP_SELF"], 'c', '', $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre('NbOfQtyInProposals', $_SERVER["PHP_SELF"], 'c', '', $param, '', $sortfield, $sortorder, 'right ');
print " \n";
foreach($infoprod as $prodid => $vals)
@@ -196,7 +196,7 @@ foreach($infoprod as $prodid => $vals)
else print $langs->trans("Product");
print '';
print ''.$vals['label'].' ';
- print ''.$vals['nblineproposal'].' ';
+ print ''.$vals['nblineproposal'].' ';
print "\n";
$i++;
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index ec1987d4764..0738d421c3c 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -893,9 +893,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI
print '';
print '' . $langs->trans("PriceByQuantityRange") . ' ' . $i . ' ';
- print '' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("UnitPrice") . ' ';
- print '' . $langs->trans("Discount") . ' ';
+ print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("UnitPrice") . ' ';
+ print '' . $langs->trans("Discount") . ' ';
print ' ';
print ' ';
foreach ($object->prices_by_qty_list[$i] as $ii => $prices)
@@ -907,18 +907,18 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI
print '';
print ' ';
print '';
} else {
print '';
print '' . $prices['quantity'] . ' ';
- print '' . price($prices['price']) . ' ';
- print '' . price($prices['unitprice']) . ' ';
- print '' . price($prices['remise_percent']) . ' % ';
- print '';
+ print ' ' . price($prices['price']) . ' ';
+ print '' . price($prices['unitprice']) . ' ';
+ print '' . price($prices['remise_percent']) . ' % ';
+ print '';
if (($user->rights->produit->creer || $user->rights->service->creer)) {
print '';
print img_edit() . ' ';
@@ -938,10 +938,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI
print ' ';
print ' ';
- print ' ';
+ print ' ';
print '';
}
@@ -1013,10 +1013,10 @@ else
print '';
//print '' . $langs->trans("PriceByQuantityRange") . ' ';
print '' . $langs->trans("Quantity") . ' ';
- print '' . $langs->trans("Price") . ' ';
- print '' . $langs->trans("UnitPrice") . ' ';
- print '' . $langs->trans("Discount") . ' ';
+ print '' . $langs->trans("Price") . ' ';
+ print '' . $langs->trans("UnitPrice") . ' ';
+ print '' . $langs->trans("Discount") . ' ';
print ' ';
print ' ';
if ($action != 'edit_price_by_qty')
@@ -1028,13 +1028,13 @@ else
print '';
print '';
//print $object->price_base_type;
print ' ';
- print ' ';
- print ' ';
+ print ' ';
print '';
@@ -1049,27 +1049,27 @@ else
print '';
print '';
+ print ' ';
//print $object->price_base_type;
print $prices['price_base_type'];
print ' ';
- print ' ';
- print ' ';
+ print ' ';
print '';
} else {
print '';
print '' . $prices['quantity'] . ' ';
- print '' . price($prices['price']) . ' ';
- print '';
+ print ' ' . price($prices['price']) . ' ';
+ print '';
//print $object->price_base_type;
print $prices['price_base_type'];
print ' ';
- print '' . price($prices['unitprice']) . ' ';
- print '' . price($prices['remise_percent']) . ' % ';
- print '';
+ print ' ' . price($prices['unitprice']) . ' ';
+ print '' . price($prices['remise_percent']) . ' % ';
+ print '';
if (($user->rights->produit->creer || $user->rights->service->creer))
{
print '';
@@ -1475,25 +1475,25 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
print ' ' . $langs->trans("AppliedPricesFrom") . ' ';
if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
- print '' . $langs->trans("PriceLevel") . ' ';
+ print '' . $langs->trans("PriceLevel") . ' ';
}
if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
- print '' . $langs->trans("Type") . ' ';
+ print '' . $langs->trans("Type") . ' ';
}
- print '' . $langs->trans("PriceBase") . ' ';
+ print '' . $langs->trans("PriceBase") . ' ';
print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
- if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '' . $langs->trans("DefaultTaxRate") . ' ';
- print '' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("TTC") . ' ';
+ if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '' . $langs->trans("DefaultTaxRate") . ' ';
+ print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("TTC") . ' ';
if (! empty($conf->dynamicprices->enabled)) {
- print '' . $langs->trans("PriceExpressionSelected") . ' ';
+ print '' . $langs->trans("PriceExpressionSelected") . ' ';
}
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("ChangedBy") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("ChangedBy") . ' ';
if ($user->rights->produit->supprimer)
- print ' ';
+ print ' ';
print ' ';
$notfirstlineforlevel=array();
@@ -1509,16 +1509,16 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
// Price level
if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
- print '' . $objp->price_level . " ";
+ print '' . $objp->price_level . " ";
}
// Price by quantity
if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
{
$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
- print '' . $langs->trans($type) . " ";
+ print '' . $langs->trans($type) . " ";
}
- print '';
+ print ' ';
if (empty($objp->price_by_qty)) {
print $langs->trans($objp->price_base_type);
}
@@ -1526,7 +1526,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
{
- print ' ';
+ print ' ';
if (empty($objp->price_by_qty)) {
$positiverates='';
@@ -1552,41 +1552,41 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
$price_expression = new PriceExpression($db);
$res = $price_expression->fetch($objp->fk_price_expression);
$title = $price_expression->title;
- print ' ' . $title . " ";
+ print '' . $title . " ";
}
else
{
- print '';
+ print ' ';
if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price) : '');
}
print " ";
- print '';
+ print ' ';
if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '');
}
print " ";
if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
- print '';
+ print ' ';
if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '');
}
print ' ';
- print '';
+ print ' ';
if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '');
}
print ' ';
// User
- print '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . ' ' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . ' ';
+ print ' ';
if ($candelete)
{
print 'id . '&lineid=' . $objp->rowid . '">';
@@ -1866,21 +1866,21 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '';
print '' . $langs->trans("ThirdParty") . ' ';
print '' . $langs->trans("AppliedPricesFrom") . ' ';
- print '' . $langs->trans("PriceBase") . ' ';
- print '' . $langs->trans("DefaultTaxRate") . ' ';
- print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("PriceBase") . ' ';
+ print '' . $langs->trans("DefaultTaxRate") . ' ';
+ print '' . $langs->trans("HT") . ' ';
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1")
{
- //print '' . $langs->trans("INCVATONLY") . ' ';
- print '' . $langs->trans("INCT") . ' ';
+ //print '' . $langs->trans("INCVATONLY") . ' ';
+ print '' . $langs->trans("INCT") . ' ';
}
else
{
- print '' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("TTC") . ' ';
}
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("ChangedBy") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("ChangedBy") . ' ';
print ' ';
print ' ';
@@ -1917,8 +1917,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print " " . $staticsoc->getNomUrl(1) . " ";
print "" . dol_print_date($line->datec, "dayhour") . " ";
- print '' . $langs->trans($line->price_base_type) . " ";
- print '';
+ print ' ' . $langs->trans($line->price_base_type) . " ";
+ print '';
$positiverates='';
if (price2num($line->tva_tx)) $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
@@ -1930,25 +1930,25 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
//. vatrate($tva_tx, true, $line->recuperableonly) .
print " ";
- print '' . price($line->price) . " ";
+ print '' . price($line->price) . " ";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1")
{
- //print '' . price($line->price_ttc) . " ";
- print '' . price($resultarray[2]) . ' ';
+ //print '' . price($line->price_ttc) . " ";
+ print '' . price($resultarray[2]) . ' ';
}
else
{
- print '' . price($line->price_ttc) . " ";
+ print '' . price($line->price_ttc) . " ";
}
- print '' . price($line->price_min) . ' ';
- print '' . price($line->price_min_ttc) . ' ';
+ print '' . price($line->price_min) . ' ';
+ print '' . price($line->price_min_ttc) . ' ';
// User
$userstatic = new User($db);
$userstatic->fetch($line->fk_user);
- print '';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
print '';
@@ -1992,7 +1992,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print ' ';
// Print the search button
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -2002,22 +2002,22 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '';
print '' . $langs->trans("ThirdParty") . ' ';
print '' . $langs->trans("AppliedPricesFrom") . ' ';
- print '' . $langs->trans("PriceBase") . ' ';
- print '' . $langs->trans("DefaultTaxRate") . ' ';
- print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("PriceBase") . ' ';
+ print '' . $langs->trans("DefaultTaxRate") . ' ';
+ print '' . $langs->trans("HT") . ' ';
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1")
{
- //print '' . $langs->trans("INCVATONLY") . ' ';
- print '' . $langs->trans("INCT") . ' ';
+ //print '' . $langs->trans("INCVATONLY") . ' ';
+ print '' . $langs->trans("INCT") . ' ';
}
else
{
- print '' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("TTC") . ' ';
}
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("ChangedBy") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("ChangedBy") . ' ';
print ' ';
print ' ';
@@ -2046,8 +2046,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print "" . $langs->trans("Default") . " ";
print "" . " ";
- print '' . $langs->trans($object->price_base_type) . " ";
- print '';
+ print ' ' . $langs->trans($object->price_base_type) . " ";
+ print '';
$positiverates='';
if (price2num($object->tva_tx)) $positiverates.=($positiverates?'/':'').price2num($object->tva_tx);
@@ -2060,26 +2060,26 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
//print $object->default_vat_code?' ('.$object->default_vat_code.')':'';
print " ";
- print '' . price($object->price) . " ";
+ print '' . price($object->price) . " ";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1")
{
- //print '' . price($object->price_ttc) . " ";
- print '' . price($resultarray[2]) . ' ';
+ //print '' . price($object->price_ttc) . " ";
+ print '' . price($resultarray[2]) . ' ';
}
else
{
- print '' . price($object->price_ttc) . " ";
+ print '' . price($object->price_ttc) . " ";
}
- print '' . price($object->price_min) . ' ';
- print '' . price($object->price_min_ttc) . ' ';
- print '';
+ print ' ' . price($object->price_min) . ' ';
+ print '' . price($object->price_min_ttc) . ' ';
+ print '';
print ' ';
if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
{
- print '';
+ print ' ';
print 'id . '">';
print img_info($langs->trans('PriceByCustomerLog'));
print ' ';
@@ -2128,8 +2128,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print " " . $staticsoc->getNomUrl(1) . " ";
print "" . dol_print_date($line->datec, "dayhour") . " ";
- print '' . $langs->trans($line->price_base_type) . " ";
- print '';
+ print ' ' . $langs->trans($line->price_base_type) . " ";
+ print '';
$positiverates='';
if (price2num($line->tva_tx)) $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
@@ -2139,25 +2139,25 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
echo vatrate($positiverates.($line->default_vat_code?' ('.$line->default_vat_code.')':''), '%', ($line->tva_npr?$line->tva_npr:$line->recuperableonly));
print " ";
- print '' . price($line->price) . " ";
+ print '' . price($line->price) . " ";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1")
{
- //print '' . price($line->price_ttc) . " ";
- print '' . price($resultarray[2]) . ' ';
+ //print '' . price($line->price_ttc) . " ";
+ print '' . price($resultarray[2]) . ' ';
}
else
{
- print '' . price($line->price_ttc) . " ";
+ print '' . price($line->price_ttc) . " ";
}
- print '' . price($line->price_min) . ' ';
- print '' . price($line->price_min_ttc) . ' ';
+ print '' . price($line->price_min) . ' ';
+ print '' . price($line->price_min_ttc) . ' ';
// User
$userstatic = new User($db);
$userstatic->fetch($line->fk_user);
- print '';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
@@ -2165,7 +2165,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
// Action
if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
{
- print '';
+ print ' ';
print 'id . '&socid=' . $line->fk_soc . '">';
print img_info($langs->trans('PriceByCustomerLog'));
print ' ';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index fd9d45828d5..31bbfa4b701 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -290,13 +290,13 @@ if ($resql)
}
// Stock limit
print ' ';
- print ' ';
+ print ' ';
print ' ';
if ($virtualdiffersfromphysical) print ' ';
print ' ';
print ' ';
print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -306,23 +306,23 @@ if ($resql)
print "";
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", $param, "", "", $sortfield, $sortorder);
- if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", $param, "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("StockLimit", $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", $param, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock", $param, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", 'align="right"', $sortfield, $sortorder);
+ if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", $param, "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("StockLimit", $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", $param, "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock", $param, "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
// Details per warehouse
if (! empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) // TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
{
if ($nb_warehouse>1) {
- foreach($warehouses_list as &$wh) {
- print_liste_field_titre($wh['label'], '', '', '', '', 'align="right"');
+ foreach ($warehouses_list as &$wh) {
+ print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
}
}
}
- if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", 'align="right"', $sortfield, $sortorder);
+ if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('');
- print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('');
print " \n";
@@ -343,18 +343,18 @@ if ($resql)
if (! empty($conf->service->enabled) && $type == 1)
{
- print '';
+ print ' ';
if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationYear");
elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationMonth");
elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationDay");
else print $objp->duration;
print ' ';
}
- //print ''.$objp->stock_theorique.' ';
- print ''.$objp->seuil_stock_alerte.' ';
- print ''.$objp->desiredstock.' ';
+ //print ''.$objp->stock_theorique.' ';
+ print ''.$objp->seuil_stock_alerte.' ';
+ print ''.$objp->desiredstock.' ';
// Real stock
- print '';
+ print ' ';
if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
print $objp->stock_physique|0;
print ' ';
@@ -365,7 +365,7 @@ if ($resql)
if($nb_warehouse>1) {
foreach($warehouses_list as &$wh) {
- print '';
+ print ' ';
print empty($product->stock_warehouse[$wh['id']]->real) ? '0' : $product->stock_warehouse[$wh['id']]->real;
print ' ';
}
@@ -375,14 +375,14 @@ if ($resql)
// Virtual stock
if ($virtualdiffersfromphysical)
{
- print '';
+ print ' ';
if ($objp->seuil_stock_alerte != '' && ($product->stock_theorique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
print $product->stock_theorique;
print ' ';
}
- print ''.$langs->trans("Movements").' '.$product->LibStatut($objp->statut, 5, 0).' ';
- print ''.$product->LibStatut($objp->tobuy, 5, 1).' ';
+ print ''.$langs->trans("Movements").' '.$product->LibStatut($objp->statut, 5, 0).' ';
+ print ''.$product->LibStatut($objp->tobuy, 5, 1).' ';
print ' ';
+ print ' ';
print ' ';
print ' ';
print ' ';
print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -302,18 +302,18 @@ if ($resql)
print "";
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", $param, "", "", $sortfield, $sortorder);
- if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", $param, "", 'align="center"', $sortfield, $sortorder);
+ if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", $param, "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Warehouse", $_SERVER["PHP_SELF"], "e.ref", $param, "", '', $sortfield, $sortorder);
- //print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
- print_liste_field_titre("Batch", $_SERVER["PHP_SELF"], "pb.batch", $param, "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", $param, "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", $param, "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", 'align="right"', $sortfield, $sortorder);
+ //print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'',$sortfield,$sortorder, 'right );
+ print_liste_field_titre("Batch", $_SERVER["PHP_SELF"], "pb.batch", $param, "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", $param, "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", $param, "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
// TODO Add info of running suppliers/customers orders
- //print_liste_field_titre("TheoreticalStock",$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
+ //print_liste_field_titre("TheoreticalStock",$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'',$sortfield,$sortorder, 'right ');
print_liste_field_titre('');
- print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('');
print " \n";
@@ -375,16 +375,16 @@ if ($resql)
if (! empty($conf->service->enabled) && $type == 1)
{
- print '';
+ print ' ';
if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationYear");
elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationMonth");
elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) print $regs[1].' '.$langs->trans("DurationDay");
else print $objp->duration;
print ' ';
}
- //print ''.$objp->stock_theorique.' ';
- //print ''.$objp->seuil_stock_alerte.' ';
- //print ''.$objp->desiredstock.' ';
+ //print ''.$objp->stock_theorique.' ';
+ //print ''.$objp->seuil_stock_alerte.' ';
+ //print ''.$objp->desiredstock.' ';
// Warehouse
print '';
@@ -395,22 +395,22 @@ if ($resql)
print ' ';
// Lot
- print '';
+ print ' ';
if ($product_lot_static->batch)
{
print $product_lot_static->getNomUrl(1);
}
print ' ';
- print ''.dol_print_date($db->jdate($objp->eatby), 'day').' ';
- print ''.dol_print_date($db->jdate($objp->sellby), 'day').' ';
- print '';
+ print ' '.dol_print_date($db->jdate($objp->eatby), 'day').' ';
+ print ''.dol_print_date($db->jdate($objp->sellby), 'day').' ';
+ print '';
//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
print $objp->stock_physique;
print ' ';
- print ''.$langs->trans("Movements").' '.$product_static->LibStatut($objp->statut, 5, 0).' ';
- print ''.$product_static->LibStatut($objp->tobuy, 5, 1).' ';
+ print ''.$langs->trans("Movements").' '.$product_static->LibStatut($objp->statut, 5, 0).' ';
+ print ''.$product_static->LibStatut($objp->tobuy, 5, 1).' ';
print '";
print_liste_field_titre("Product", "", "p.ref", "&id=".$id, "", "", $sortfield, $sortorder);
print_liste_field_titre("Label", "", "p.label", "&id=".$id, "", "", $sortfield, $sortorder);
- print_liste_field_titre("Units", "", "ps.reel", "&id=".$id, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("AverageUnitPricePMPShort", "", "p.pmp", "&id=".$id, "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("EstimatedStockValueShort", "", "", "&id=".$id, "", 'align="right"', $sortfield, $sortorder);
- if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre("SellPriceMin", "", "p.price", "&id=".$id, "", 'align="right"', $sortfield, $sortorder);
- if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre("EstimatedStockValueSellShort", "", "", "&id=".$id, "", 'align="right"', $sortfield, $sortorder);
- if ($user->rights->stock->mouvement->creer) print_liste_field_titre('');
- if ($user->rights->stock->creer) print_liste_field_titre('');
+ print_liste_field_titre("Units", "", "ps.reel", "&id=".$id, "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("AverageUnitPricePMPShort", "", "p.pmp", "&id=".$id, "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("EstimatedStockValueShort", "", "", "&id=".$id, "", '', $sortfield, $sortorder, 'right ');
+ if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+ print_liste_field_titre("SellPriceMin", "", "p.price", "&id=".$id, "", '', $sortfield, $sortorder, 'right ');
+ }
+ if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+ print_liste_field_titre("EstimatedStockValueSellShort", "", "", "&id=".$id, "", '', $sortfield, $sortorder, 'right ');
+ }
+ if ($user->rights->stock->mouvement->creer) {
+ print_liste_field_titre('');
+ }
+ if ($user->rights->stock->creer) {
+ print_liste_field_titre('');
+ }
print " \n";
$totalunit=0;
@@ -506,28 +514,28 @@ else
// Label
print ''.$objp->produit.' ';
- print '';
+ print ' ';
$valtoshow=price2num($objp->value, 'MS');
print empty($valtoshow)?'0':$valtoshow;
print ' ';
$totalunit+=$objp->value;
// Price buy PMP
- print ''.price(price2num($objp->ppmp, 'MU')).' ';
+ print ''.price(price2num($objp->ppmp, 'MU')).' ';
// Total PMP
- print ''.price(price2num($objp->ppmp*$objp->value, 'MT')).' ';
+ print ''.price(price2num($objp->ppmp*$objp->value, 'MT')).' ';
$totalvalue+=price2num($objp->ppmp*$objp->value, 'MT');
// Price sell min
if (empty($conf->global->PRODUIT_MULTIPRICES))
{
$pricemin=$objp->price;
- print '';
+ print ' ';
print price(price2num($pricemin, 'MU'), 1);
print ' ';
// Total sell min
- print '';
+ print ' ';
print price(price2num($pricemin*$objp->value, 'MT'), 1);
print ' ';
}
@@ -535,14 +543,14 @@ else
if ($user->rights->stock->mouvement->creer)
{
- print '';
+ print ' ';
print img_picto($langs->trans("StockMovement"), 'uparrow.png', 'class="hideonsmartphone"').' '.$langs->trans("StockMovement");
print " ';
+ print ' ';
print $langs->trans("StockCorrection");
print " '.$langs->trans("Total").' ';
- print '';
+ print ' ';
$valtoshow=price2num($totalunit, 'MS');
print empty($valtoshow)?'0':$valtoshow;
print ' ';
print ' ';
- print ''.price(price2num($totalvalue, 'MT')).' ';
+ print ''.price(price2num($totalvalue, 'MT')).' ';
if (empty($conf->global->PRODUIT_MULTIPRICES))
{
print ' ';
- print ''.price(price2num($totalvaluesell, 'MT')).' ';
+ print ''.price(price2num($totalvaluesell, 'MT')).' ';
}
print ' ';
print ' ';
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 9dd34f18569..ba8339f98ed 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -205,7 +205,7 @@ class Warehouses extends DolibarrApi
}
if($this->warehouse->update($id, DolibarrApiAccess::$user))
- return $this->get ($id);
+ return $this->get($id);
return false;
}
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index fe9577c5ca8..81e8680034e 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2008 Regis Houssin
* Copyright (C) 2011 Juanjo Menent
* Copyright (C) 2016 Francis Appels
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@ class Entrepot extends CommonObject
public $table_element='entrepot';
public $picto='stock';
+ public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
/**
* Warehouse closed, inactive
@@ -75,8 +77,14 @@ class Entrepot extends CommonObject
*/
public $address;
- //! Code Postal
+ /**
+ * @var string Zipcode
+ */
public $zip;
+
+ /**
+ * @var string Town
+ */
public $town;
/**
@@ -572,26 +580,26 @@ class Entrepot extends CommonObject
{
return $label;
}
- if ($mode == 1)
+ elseif ($mode == 1)
{
return $label;
}
- if ($mode == 2)
+ elseif ($mode == 2)
{
if ($statut > 0) $picto = 'statut4';
return img_picto($label, $picto).' '.$label;
}
- if ($mode == 3)
+ elseif ($mode == 3)
{
if ($statut > 0) $picto = 'statut4';
return img_picto($label, $picto).' '.$label;
}
- if ($mode == 4)
+ elseif ($mode == 4)
{
if ($statut > 0) $picto = 'statut4';
return img_picto($label, $picto).' '.$label;
}
- if ($mode == 5)
+ elseif ($mode == 5)
{
if ($statut > 0) $picto = 'statut4';
return $label.' '.img_picto($label, $picto);
@@ -616,7 +624,6 @@ class Entrepot extends CommonObject
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
$result='';
- $label = '';
$label = '' . $langs->trans("ShowWarehouse").' ';
$label.= '' . $langs->trans('Ref') . ': ' . (empty($this->ref)?(empty($this->label)?$this->libelle:$this->label):$this->ref);
@@ -723,9 +730,9 @@ class Entrepot extends CommonObject
/**
* Return array of children warehouses ids from $id warehouse (recursive function)
*
- * @param int $id id parent warehouse
- * @param array $TChildWarehouses array which will contain all children (param by reference)
- * @return array $TChildWarehouses array which will contain all children
+ * @param int $id id parent warehouse
+ * @param integer[] $TChildWarehouses array which will contain all children (param by reference)
+ * @return integer[] $TChildWarehouses array which will contain all children
*/
function get_children_warehouses($id, &$TChildWarehouses)
{
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index ea11974ae97..a19025b5dd6 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -92,7 +92,7 @@ if ($result)
print '';
print "rowid\">".img_object($langs->trans("ShowStock"), "stock")." ".$objp->label." '.$entrepot->LibStatut($objp->statut, 5).' ';
+ print ''.$entrepot->LibStatut($objp->statut, 5).' ';
print " \n";
$i++;
}
@@ -142,7 +142,7 @@ if ($resql)
print ''.$langs->trans("EatByDate").' ';
}
print ''.$langs->trans("Warehouse").' ';
- print ''.$langs->trans("FullList").' '.$langs->trans("FullList").' ';
print img_object($langs->trans("ShowWarehouse"), "stock").' '.$objp->stock;
print " ';
+ print ' ';
if ($objp->qty > 0) print '+';
print $objp->qty.' ';
print "\n";
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 95071085923..7db2dffc7db 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -162,22 +162,22 @@ if ($result)
// Lignes des champs de filtre
print '';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
print '';
print ' ';
- print '';
+ print ' ';
print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -187,10 +187,10 @@ if ($result)
print ' ';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stockqty", '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "estimatedvalue", '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stockqty", '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "estimatedvalue", '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
print " \n";
@@ -213,14 +213,14 @@ if ($result)
// Location
print ''.$objp->lieu.' ';
// Stock qty
- print ''.price2num($objp->stockqty, 5).' ';
+ print ''.price2num($objp->stockqty, 5).' ';
// PMP value
- print '';
+ print ' ';
if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
else print '';
print ' ';
// Selling value
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
else
{
@@ -229,7 +229,7 @@ if ($result)
}
print ' ';
// Status
- print ''.$warehouse->LibStatut($objp->statut, 5).' ';
+ print ''.$warehouse->LibStatut($objp->statut, 5).' ';
print '';
- print ''.$langs->trans("Total").' ';
- print ''.price2num($totalStock, 5).' ';
- print ''.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
- print '';
+ print ' '.$langs->trans("Total").' ';
+ print ''.price2num($totalStock, 5).' ';
+ print ''.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
+ print '';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency);
else
{
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 81a625f254c..bae6ff55ef7 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -347,14 +347,13 @@ print '';
$param='';
print '';
-print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', 'class="tagtd maxwidthonsmartphone"', $sortfield, $sortorder);
-if ($conf->productbatch->enabled)
-{
- print getTitleFieldOfList($langs->trans('Batch'), 0, $_SERVER["PHP_SELF"], '', $param, '', 'class="tagtd maxwidthonsmartphone"', $sortfield, $sortorder);
+print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+if ($conf->productbatch->enabled) {
+ print getTitleFieldOfList($langs->trans('Batch'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
}
-print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', 'class="tagtd maxwidthonsmartphone"', $sortfield, $sortorder);
-print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', 'class="tagtd maxwidthonsmartphone"', $sortfield, $sortorder);
-print getTitleFieldOfList($langs->trans('Qty'), 0, $_SERVER["PHP_SELF"], '', $param, '', 'align="center" class="tagtd maxwidthonsmartphone"', $sortfield, $sortorder);
+print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+print getTitleFieldOfList($langs->trans('Qty'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
print getTitleFieldOfList('', 0);
print ' ';
@@ -364,8 +363,7 @@ print '';
print '';
$filtertype=0;
if (! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype='';
-if ($conf->global->PRODUIT_LIMIT_SIZE <= 0)
-{
+if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
$limit='';
}
else
@@ -391,9 +389,9 @@ print ' ';
print $formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
print ' ';
// Qty
-print ' ';
@@ -420,8 +418,8 @@ foreach($listofdata as $key => $val)
print '';
print $warehousestatict->getNomUrl(1);
print ' ';
- print ''.$val['qty'].' ';
- print ''.img_delete($langs->trans("Remove")).' '.$val['qty'].' ';
+ print ''.img_delete($langs->trans("Remove")).'
* Copyright (C) 2004-2017 Laurent Destailleur
* Copyright (C) 2005-2014 Regis Houssin
* Copyright (C) 2015 Juanjo Menent
* Copyright (C) 2018 Ferran Marcet
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,8 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->projet->enabled))
-{
+if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
}
@@ -771,7 +771,7 @@ if ($resql)
if (! empty($arrayfields['m.rowid']['checked']))
{
// Ref
- print '';
+ print ' ';
print ' ';
}
@@ -789,36 +789,36 @@ if ($resql)
if (! empty($arrayfields['p.ref']['checked']))
{
// Product Ref
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['p.label']['checked']))
{
// Product label
- print '';
+ print ' ';
print ' ';
}
// Batch
if (! empty($arrayfields['m.batch']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['pl.sellby']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
// Warehouse
if (! empty($arrayfields['e.ref']['checked']))
{
- print '';
+ print ' ';
//print ' ';
@@ -826,28 +826,28 @@ if ($resql)
if (! empty($arrayfields['m.fk_user_author']['checked']))
{
// Author
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.inventorycode']['checked']))
{
// Inventory code
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.label']['checked']))
{
// Label of movement
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.type_mouvement']['checked']))
{
// Type of movement
- print '';
+ print ' ';
//print '';
print '';
+ print ' ';
print ' ';
print ' ';
}
if (! empty($arrayfields['m.value']['checked']))
{
// Qty
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '';
+ print ' ';
print ' ';
print ' ';
}
@@ -904,7 +904,7 @@ if ($resql)
print ' ';
}
// Actions
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -920,13 +920,15 @@ if ($resql)
if (! empty($arrayfields['p.label']['checked']))
print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['m.batch']['checked']))
- print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['pl.eatby']['checked']))
- print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['pl.sellby']['checked']))
- print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.ref']['checked']))
- print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder); // We are on a specific warehouse card, no filter on other should be possible
+ print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['e.ref']['checked'])) {
+ // We are on a specific warehouse card, no filter on other should be possible
+ print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+ }
if (! empty($arrayfields['m.fk_user_author']['checked']))
print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['m.inventorycode']['checked']))
@@ -934,13 +936,13 @@ if ($resql)
if (! empty($arrayfields['m.label']['checked']))
print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['m.type_mouvement']['checked']))
- print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['origin']['checked']))
print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['m.value']['checked']))
- print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
if (! empty($arrayfields['m.price']['checked']))
- print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -949,16 +951,19 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['m.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['m.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['m.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['m.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
$arrayofuniqueproduct=array();
- while ($i < min($num, $limit))
- {
+ while ($i < min($num, $limit)) {
$objp = $db->fetch_object($resql);
$userstatic->id=$objp->fk_user_author;
@@ -984,7 +989,7 @@ if ($resql)
$warehousestatic->lieu=$objp->lieu;
$arrayofuniqueproduct[$objp->rowid]=$objp->produit;
- if(!empty($objp->fk_origin)) {
+ if (!empty($objp->fk_origin)) {
$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
} else {
$origin = '';
@@ -994,7 +999,8 @@ if ($resql)
// Id movement
if (! empty($arrayfields['m.rowid']['checked']))
{
- print ''.$objp->mid.' '; // This is primary not movement id
+ // This is primary not movement id
+ print ''.$objp->mid.' ';
}
if (! empty($arrayfields['m.datem']['checked']))
{
@@ -1028,11 +1034,11 @@ if ($resql)
}
if (! empty($arrayfields['pl.eatby']['checked']))
{
- print ''. dol_print_date($objp->eatby, 'day') .' ';
+ print ''. dol_print_date($objp->eatby, 'day') .' ';
}
if (! empty($arrayfields['pl.sellby']['checked']))
{
- print ''. dol_print_date($objp->sellby, 'day') .' ';
+ print ''. dol_print_date($objp->sellby, 'day') .' ';
}
// Warehouse
if (! empty($arrayfields['e.ref']['checked']))
@@ -1071,16 +1077,16 @@ if ($resql)
// Type of movement
switch($objp->type_mouvement) {
case "0":
- print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
break;
case "1":
- print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
break;
case "2":
- print ''.$langs->trans('StockDecrease').' ';
+ print ''.$langs->trans('StockDecrease').' ';
break;
case "3":
- print ''.$langs->trans('StockIncrease').' ';
+ print ''.$langs->trans('StockIncrease').' ';
break;
}
}
@@ -1092,7 +1098,7 @@ if ($resql)
if (! empty($arrayfields['m.value']['checked']))
{
// Qty
- print '';
+ print ' ';
if ($objp->qt > 0) print '+';
print $objp->qty;
print ' ';
@@ -1100,12 +1106,12 @@ if ($resql)
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '';
+ print ' ';
if ($objp->price != 0) print price($objp->price);
print ' ';
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -1130,8 +1136,7 @@ if ($resql)
print " ';
print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
//print ' ';
- //print '';
+ //print ' ';
print ': '.$balancebefore;
print " ';
print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
//print ' ';
- //print '';
+ //print ' ';
print ': '.$balanceafter;
print "
* Copyright (C) 2015 Juanjo Menent
* Copyright (C) 2018 Ferran Marcet
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -768,7 +769,7 @@ if ($resql)
if (! empty($arrayfields['m.rowid']['checked']))
{
// Ref
- print '';
+ print ' ';
print ' ';
}
@@ -786,36 +787,36 @@ if ($resql)
if (! empty($arrayfields['p.ref']['checked']))
{
// Product Ref
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['p.label']['checked']))
{
// Product label
- print '';
+ print ' ';
print ' ';
}
// Batch
if (! empty($arrayfields['m.batch']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['pl.sellby']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
// Warehouse
if (! empty($arrayfields['e.ref']['checked']))
{
- print '';
+ print ' ';
//print ' ';
@@ -823,28 +824,28 @@ if ($resql)
if (! empty($arrayfields['m.fk_user_author']['checked']))
{
// Author
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.inventorycode']['checked']))
{
// Inventory code
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.label']['checked']))
{
// Label of movement
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.type_mouvement']['checked']))
{
// Type of movement
- print '';
+ print ' ';
//print '';
print '';
+ print ' ';
print ' ';
print ' ';
}
if (! empty($arrayfields['m.value']['checked']))
{
// Qty
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '';
+ print ' ';
print ' ';
print ' ';
}
@@ -901,28 +902,59 @@ if ($resql)
print ' ';
}
// Actions
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
print "\n";
print '';
- if (! empty($arrayfields['m.rowid']['checked'])) print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['m.datem']['checked'])) print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['p.label']['checked'])) print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['m.batch']['checked'])) print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['pl.eatby']['checked'])) print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['pl.sellby']['checked'])) print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder); // We are on a specific warehouse card, no filter on other should be possible
- if (! empty($arrayfields['m.fk_user_author']['checked'])) print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['m.inventorycode']['checked'])) print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['m.label']['checked'])) print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['m.type_mouvement']['checked'])) print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['origin']['checked'])) print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
- if (! empty($arrayfields['m.value']['checked'])) print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['m.price']['checked'])) print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, 'align="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['m.rowid']['checked'])) {
+ print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.datem']['checked'])) {
+ print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.ref']['checked'])) {
+ print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['p.label']['checked'])) {
+ print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.batch']['checked'])) {
+ print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['pl.eatby']['checked'])) {
+ print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['pl.sellby']['checked'])) {
+ print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['e.ref']['checked'])) {
+ // We are on a specific warehouse card, no filter on other should be possible
+ print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.fk_user_author']['checked'])) {
+ print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.inventorycode']['checked'])) {
+ print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.label']['checked'])) {
+ print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.type_mouvement']['checked'])) {
+ print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
+ if (! empty($arrayfields['origin']['checked'])) {
+ print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
+ }
+ if (! empty($arrayfields['m.value']['checked'])) {
+ print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
+ if (! empty($arrayfields['m.price']['checked'])) {
+ print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -931,9 +963,13 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['m.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['m.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['m.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['m.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
@@ -1010,11 +1046,11 @@ if ($resql)
}
if (! empty($arrayfields['pl.eatby']['checked']))
{
- print ''. dol_print_date($objp->eatby, 'day') .' ';
+ print ''. dol_print_date($objp->eatby, 'day') .' ';
}
if (! empty($arrayfields['pl.sellby']['checked']))
{
- print ''. dol_print_date($objp->sellby, 'day') .' ';
+ print ''. dol_print_date($objp->sellby, 'day') .' ';
}
// Warehouse
if (! empty($arrayfields['e.ref']['checked']))
@@ -1053,16 +1089,16 @@ if ($resql)
// Type of movement
switch($objp->type_mouvement){
case "0":
- print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
break;
case "1":
- print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
break;
case "2":
- print ''.$langs->trans('StockDecrease').' ';
+ print ''.$langs->trans('StockDecrease').' ';
break;
case "3":
- print ''.$langs->trans('StockIncrease').' ';
+ print ''.$langs->trans('StockIncrease').' ';
break;
}
}
@@ -1074,7 +1110,7 @@ if ($resql)
if (! empty($arrayfields['m.value']['checked']))
{
// Qty
- print '';
+ print ' ';
if ($objp->qt > 0) print '+';
print $objp->qty;
print ' ';
@@ -1082,12 +1118,12 @@ if ($resql)
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '';
+ print ' ';
if ($objp->price != 0) print price($objp->price);
print ' ';
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -1125,14 +1161,14 @@ if ($resql)
//print ' ';
print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
//print ' ';
- //print '';
+ //print ' ';
print ': '.$balancebefore;
print " ';
print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
//print ' ';
- //print '';
+ //print ' ';
print ': '.$balanceafter;
print "
+ * Copyright (C) 2004-2015 Laurent Destailleur
* Copyright (C) 2004 Eric Seigne
* Copyright (C) 2005 Simon TOSSER
* Copyright (C) 2005-2009 Regis Houssin
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2013-2018 Juanjo Menent
* Copyright (C) 2014-2015 Cédric Gross
- * Copyright (C) 2015 Marcos García
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2015 Marcos García
+ * Copyright (C) 2018-2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -38,9 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-if (! empty($conf->projet->enabled))
-{
+if (! empty($conf->productbatch->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+}
+if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
}
@@ -807,17 +808,17 @@ if (! $variants) {
print '';
print '';
print '' . $langs->trans("Warehouse") . ' ';
- print '' . $langs->trans("NumberOfUnit") . ' ';
- print '' . $langs->trans("AverageUnitPricePMPShort") . ' ';
- print '' . $langs->trans("EstimatedStockValueShort") . ' ';
- print '' . $langs->trans("SellPriceMin") . ' ';
- print '' . $langs->trans("EstimatedStockValueSellShort") . ' ';
+ print '' . $langs->trans("NumberOfUnit") . ' ';
+ print '' . $langs->trans("AverageUnitPricePMPShort") . ' ';
+ print '' . $langs->trans("EstimatedStockValueShort") . ' ';
+ print '' . $langs->trans("SellPriceMin") . ' ';
+ print '' . $langs->trans("EstimatedStockValueSellShort") . ' ';
print ' ';
if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
print '' . $langs->trans("batch_number") . ' ';
- print '' . $langs->trans("EatByDate") . ' ';
- print '' . $langs->trans("SellByDate") . ' ';
+ print '' . $langs->trans("batch_number") . ' ';
+ print '' . $langs->trans("EatByDate") . ' ';
+ print '' . $langs->trans("SellByDate") . ' ';
print '';
print '' . $entrepotstatic->getNomUrl(1) . ' ';
- print '' . $stock_real . ($stock_real < 0 ? ' ' . img_warning() : '') . ' ';
+ print '' . $stock_real . ($stock_real < 0 ? ' ' . img_warning() : '') . ' ';
// PMP
- print '' . (price2num($object->pmp) ? price2num($object->pmp, 'MU') : '') . ' ';
+ print '' . (price2num($object->pmp) ? price2num($object->pmp, 'MU') : '') . ' ';
// Value purchase
- print '' . (price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '') . ' ';
+ print '' . (price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '') . ' ';
// Sell price
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price, 'MU'), 1);
else print $langs->trans("Variable");
print ' ';
// Value sell
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($object->price * $obj->reel, 'MT'), 1) . ' ';
else print $langs->trans("Variable");
print ' ';
@@ -890,33 +891,33 @@ if (! $variants) {
print '';
print '';
print ' ';
} else {
- print "\n" . '';
+ print "\n" . ' ';
print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"') . ' ';
print 'id . '">' . $langs->trans("TransferStock") . ' ';
// Disabled, because edition of stock content must use the "Correct stock menu".
// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
//print 'id.'#'.$pdluo->id.'">';
//print img_edit().' ';
- print '';
+ print ' ';
print $product_lot_static->getNomUrl(1);
print ' ';
- print '' . dol_print_date($pdluo->eatby, 'day') . ' ';
- print '' . dol_print_date($pdluo->sellby, 'day') . ' ';
- print '' . $pdluo->qty . ($pdluo->qty < 0 ? ' ' . img_warning() : '') . ' ';
+ print '' . dol_print_date($pdluo->eatby, 'day') . ' ';
+ print '' . dol_print_date($pdluo->sellby, 'day') . ' ';
+ print '' . $pdluo->qty . ($pdluo->qty < 0 ? ' ' . img_warning() : '') . ' ';
print '' . $langs->trans("Total") . ': ';
- print '' . price2num($total, 'MS') . ' ';
- print '';
+ print ' ' . $langs->trans("Total") . ': ';
+ print '' . price2num($total, 'MS') . ' ';
+ print '';
print ($totalwithpmp ? price(price2num($totalvalue / $totalwithpmp, 'MU')) : ' '); // This value may have rounding errors
print ' ';
// Value purchase
- print '';
+ print ' ';
print $totalvalue ? price(price2num($totalvalue, 'MT'), 1) : ' ';
print ' ';
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print ($total ? price($totalvaluesell / $total, 1) : ' ');
else print $langs->trans("Variable");
print ' ';
// Value to sell
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalvaluesell, 'MT'), 1);
else print $langs->trans("Variable");
print ' ';
@@ -959,14 +960,14 @@ if (! $variants) {
print '';
if (!empty($user->rights->produit->creer)) {
print '' . $formproduct->selectWarehouses('', 'fk_entrepot') . ' ';
- print '' . $langs->trans("Warehouse") . ' ';
- print '' . $langs->trans("StockLimit") . ' ';
- print '' . $langs->trans("DesiredStock") . ' ';
+ print '' . $langs->trans("StockLimit") . ' ';
+ print '' . $langs->trans("DesiredStock") . ' ';
print '' . $ent->getNomUrl(3) . ' ';
- print '' . $line['seuil_stock_alerte'] . ' ';
- print '' . $line['desiredstock'] . ' ';
+ print '' . $line['seuil_stock_alerte'] . ' ';
+ print '' . $line['desiredstock'] . ' ';
if (!empty($user->rights->produit->creer)) {
- print '' . img_delete() . ' ' . img_delete() . ' ';
- print ''.$langs->trans("Total").' ';
- print ''.$stock_total.' ';
+ print ''.$langs->trans("Total").' ';
+ print ''.$stock_total.' ';
print ' ';
}
else
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 54243e3c853..7105470032c 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2018 Ferran Marcet
+/* Copyright (C) 2007-2016 Laurent Destailleur
+ * Copyright (C) 2018 Ferran Marcet
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,10 +18,10 @@
*/
/**
- * \file product/stock/productlot_list.php
- * \ingroup stock
- * \brief This file is an example of a php page
- * Initialy built by build_class_from_table on 2016-05-17 12:22
+ * \file product/stock/productlot_list.php
+ * \ingroup stock
+ * \brief This file is an example of a php page
+ * Initialy built by build_class_from_table on 2016-05-17 12:22
*/
require '../../main.inc.php';
@@ -34,10 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
$langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
// Get parameters
-$id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
-$myparam = GETPOST('myparam', 'alpha');
+$myparam = GETPOST('myparam', 'alpha');
$toselect = GETPOST('toselect', 'array');
@@ -362,12 +363,12 @@ if ($resql)
/*if (! empty($arrayfields['u.statut']['checked']))
{
// Status
- print '';
+ print ' ';
print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
print ' ';
}*/
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print ' ';
@@ -389,11 +390,17 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['t.datec']['checked'])) print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- //if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($arrayfields['t.status']['label'],$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
- print ''."\n";
+ if (! empty($arrayfields['t.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['t.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ //if (! empty($arrayfields['t.status']['checked'])) {
+ // print_liste_field_titre($arrayfields['t.status']['label'], $_SERVER["PHP_SELF"], "t.status", "", $param, '', $sortfield, $sortorder, 'center ');
+ //}
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ print ''."\n";
$productlot = new Productlot($db);
@@ -464,7 +471,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['t.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -472,7 +479,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['t.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -482,11 +489,11 @@ if ($resql)
if (! empty($arrayfields['u.statut']['checked']))
{
$userstatic->statut=$obj->statut;
- print ''.$userstatic->getLibStatut(3).' ';
+ print ''.$userstatic->getLibStatut(3).' ';
}*/
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -514,9 +521,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
- elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
- elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
+ elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
+ elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
else print '
* Copyright (C) 2016 Juanjo Menent
* Copyright (C) 2016 ATM Consulting
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -534,11 +535,11 @@ print ' ';
print ' ';
-print ' ';
-print '' . $langs->trans('AlertOnly') . ' ';
-print '' . $langs->trans('IncludeAlsoDraftOrders') . ' ';
+print ' ';
+print '' . $langs->trans('AlertOnly') . ' ';
+print '' . $langs->trans('IncludeAlsoDraftOrders') . ' ';
print ' ';
-print '';
+print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -549,13 +550,13 @@ print '';
print_liste_field_titre(' \n";
while ($i < ($limit ? min($num, $limit) : $num))
@@ -660,27 +661,27 @@ while ($i < ($limit ? min($num, $limit) : $num))
} else {
$duration = $objp->duration;
}
- print ''.$duration.' ';
+ print ''.$duration.' ';
}
// Desired stock
- print '' . $desiredstock . ' ';
+ print '' . $desiredstock . ' ';
// Limit stock for alert
- print '' . $alertstock . ' ';
+ print '' . $alertstock . ' ';
// Current stock (all warehouses)
- print ''. $warning . $stock. ' ';
+ print ''. $warning . $stock. ' ';
// Already ordered
- print ''. $ordered . ' ' . $picto. ''. $ordered . ' ' . $picto. ''. $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier).' ';
+ print ''. $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier).' ';
print '';
}
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 40119d91c65..617d40b5232 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2014 Regis Houssin
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018-2019 Frédéric France
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -198,7 +198,7 @@ if ($resql)
''.
$form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '').
' '.
- '';
+ ' ';
$searchpicto = $form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -261,9 +261,10 @@ if ($resql)
'cf.fk_statut',
'',
$param,
- 'align="right"',
+ '',
$sortfield,
- $sortorder
+ $sortorder,
+ 'right '
);
print '';
@@ -277,13 +278,12 @@ if ($resql)
if ($showline)
{
- $href = DOL_URL_ROOT . '/fourn/commande/card.php?id=' . $obj->rowid;
- print ''.
+ $href = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid;
+ print ' ';
// Ref
- ''.
- ''.
- img_object($langs->trans('ShowOrder'), 'order') . ' ' . $obj->ref.
- ' ';
+ print '';
+ print ''.img_object($langs->trans('ShowOrder'), 'order').' '.$obj->ref.' ';
+ print ' ';
// Company
$href = DOL_URL_ROOT . '/fourn/card.php?socid=' . $obj->socid;
@@ -300,13 +300,9 @@ if ($resql)
} else {
$txt = ' ';
}
- print ''.
- $txt.
- ' '.
+ print ''.$txt.' ';
// Amount
- ''.
- price($obj->total_ttc).
- ' ';
+ print ''.price($obj->total_ttc).' ';
// Date
if ($obj->dc) {
@@ -314,14 +310,10 @@ if ($resql)
} else {
$date = '-';
}
- print ''.
- $date.
- ' '.
+ print ''.$date.' ';
// Statut
- ''.
- $commandestatic->LibStatut($obj->fk_statut, 5).
- ' '.
- ' ';
+ print ''.$commandestatic->LibStatut($obj->fk_statut, 5).' ';
+ print '';
}
$i++;
}
@@ -334,7 +326,7 @@ if ($resql)
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
// End of page
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 1bc9ffbb018..6bfdb67f068 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -87,9 +87,9 @@ if ($result)
print "";
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder);
- print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', '', $sortfield, $sortorder, 'right ');
print " \n";
if ($num)
@@ -104,17 +104,17 @@ if ($result)
print ''.img_object($langs->trans("ShowWarehouse"), 'stock').' '.$objp->ref.' '.$objp->lieu.' ';
// PMP value
- print '';
+ print ' ';
if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
else print '';
print ' ';
// Selling value
- print '';
+ print ' ';
if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
else print $langs->trans("Variable");
print ' ';
// Status
- print ''.$entrepot->LibStatut($objp->statut, 5).' ';
+ print ''.$entrepot->LibStatut($objp->statut, 5).' ';
print "\n";
$total += price2num($objp->estimatedvalue, 'MU');
$totalsell += price2num($objp->sellvalue, 'MU');
@@ -123,10 +123,10 @@ if ($result)
}
print '';
- print ''.$langs->trans("Total").' ';
- print ''.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
- print ''.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
- print ' ';
+ print ''.$langs->trans("Total").' ';
+ print ''.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
+ print ''.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' ';
+ print ' ';
print " \n";
}
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 4c2d03b796e..6f5a63129de 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -127,7 +127,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
print '';
print '';
print ''.$langs->trans('ActivityOnProjectToday').' ';
-print ''.$langs->trans("Time").' ';
+print ''.$langs->trans("Time").' ';
print " \n";
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
@@ -157,7 +157,7 @@ if ( $resql )
$projectstatic->public=$row->public;
print $projectstatic->getNomUrl(1, '', 1);
print '';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
print "\n";
$total += $row->nb;
}
@@ -170,7 +170,7 @@ else
}
print '';
print ''.$langs->trans('Total').' ';
-print ''.convertSecondToTime($total, 'allhourmin').' ';
+print ''.convertSecondToTime($total, 'allhourmin').' ';
print " \n";
print "
";
@@ -182,7 +182,7 @@ print '';
print '
';
print '';
print ''.$langs->trans('ActivityOnProjectYesterday').' ';
-print ''.$langs->trans("Time").' ';
+print ''.$langs->trans("Time").' ';
print " \n";
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
@@ -212,7 +212,7 @@ if ( $resql )
$projectstatic->public=$row->public;
print $projectstatic->getNomUrl(1, '', 1);
print '';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
print "\n";
$total += $row->nb;
}
@@ -225,7 +225,7 @@ else
}
print '';
print ''.$langs->trans('Total').' ';
-print ''.convertSecondToTime($total, 'allhourmin').' ';
+print ''.convertSecondToTime($total, 'allhourmin').' ';
print " \n";
print "
";
@@ -240,7 +240,7 @@ if ($db->type != 'pgsql')
print '
';
print '';
print ''.$langs->trans("ActivityOnProjectThisWeek").' ';
- print ''.$langs->trans("Time").' ';
+ print ''.$langs->trans("Time").' ';
print " \n";
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
@@ -270,7 +270,7 @@ if ($db->type != 'pgsql')
$projectstatic->public=$row->public;
print $projectstatic->getNomUrl(1, '', 1);
print '';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
print "\n";
$total += $row->nb;
}
@@ -283,7 +283,7 @@ if ($db->type != 'pgsql')
}
print '';
print ''.$langs->trans('Total').' ';
- print ''.convertSecondToTime($total, 'allhourmin').' ';
+ print ''.convertSecondToTime($total, 'allhourmin').' ';
print " \n";
print "
";
@@ -296,7 +296,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH))
print '
';
print '';
print ''.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").' ';
- print ''.$langs->trans("Time").' ';
+ print ''.$langs->trans("Time").' ';
print " \n";
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
@@ -323,7 +323,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH))
$projectstatic->title=$row->title;
print $projectstatic->getNomUrl(1, '', 1);
print '';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
print "\n";
}
$db->free($resql);
@@ -334,7 +334,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH))
}
print '';
print ''.$langs->trans('Total').' ';
- print ''.convertSecondToTime($total, 'allhourmin').' ';
+ print ''.convertSecondToTime($total, 'allhourmin').' ';
print " \n";
print "
";
}
@@ -345,7 +345,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
print '
';
print '';
print ''.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).' ';
- print ''.$langs->trans("Time").' ';
+ print ''.$langs->trans("Time").' ';
print " \n";
$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
@@ -373,7 +373,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
$projectstatic->public=$row->public;
print $projectstatic->getNomUrl(1, '', 1);
print '';
- print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
+ print ''.convertSecondToTime($row->nb, 'allhourmin').' ';
print "\n";
}
$db->free($resql);
@@ -384,7 +384,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR))
}
print '';
print ''.$langs->trans('Total').' ';
- print ''.convertSecondToTime($total, 'allhourmin').' ';
+ print ''.convertSecondToTime($total, 'allhourmin').' ';
print " \n";
print "
";
}
@@ -467,12 +467,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
print '
'.$langs->trans('OpenedProjects').' ';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print '
'.$langs->trans('OpportunityStatus').' ';
print '
'.$langs->trans('Task').' ';
- print '
'.$langs->trans('DateStart').' ';
- print '
'.$langs->trans('DateEnd').' ';
- print '
'.$langs->trans('PlannedWorkload').' ';
- print '
'.$langs->trans('TimeSpent').' ';
- print '
'.$langs->trans("ProgressCalculated").'';
- print ' '.$langs->trans("ProgressDeclared").'';
+ print ' '.$langs->trans('DateStart').' ';
+ print '
'.$langs->trans('DateEnd').' ';
+ print '
'.$langs->trans('PlannedWorkload').' ';
+ print '
'.$langs->trans('TimeSpent').' ';
+ print '
'.$langs->trans("ProgressCalculated").'';
+ print ' '.$langs->trans("ProgressDeclared").'';
print '';
while ($i < $num && $i < $max)
@@ -522,18 +522,18 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
$taskstatic->fk_statut = $obj->status;
$taskstatic->dateo = $db->jdate($obj->dateo);
$taskstatic->datee = $db->jdate($obj->datee);
- print ' '.dol_print_date($db->jdate($obj->dateo), 'day').' ';
- print '
'.dol_print_date($db->jdate($obj->datee), 'day');
+ print ' '.dol_print_date($db->jdate($obj->dateo), 'day').' ';
+ print '
'.dol_print_date($db->jdate($obj->datee), 'day');
print dol_print_date($obj->date_end, 'dayhour');
if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
print ' ';
- print '
';
+ print ' ';
print convertSecondToTime($obj->planned_workload, 'allhourmin');
print ' ';
- print '
';
+ print ' ';
print convertSecondToTime($obj->timespent, 'allhourmin');
print ' ';
- print '
';
+ print ' ';
if (! empty($obj->taskid))
{
if (empty($obj->planned_workload) > 0) {
@@ -544,7 +544,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
}
print $percentcompletion;
print ' ';
- print '
';
+ print ' ';
print ($obj->taskid>0)?$obj->progress.'%':'';
print ' ';
print "\n";
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index a7c9aaf329d..7fe2d0af8a6 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -485,7 +485,7 @@ print '
';
print '
';
print '
';
// Action column
-print '
';
+print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -495,13 +495,13 @@ print '
';
if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").' ';
if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").' ';
print ''.$langs->trans("Task").' ';
-print ''.$langs->trans("PlannedWorkload").' ';
-print ''.$langs->trans("ProgressDeclared").' ';
-/*print ''.$langs->trans("TimeSpent").' ';
-if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' ';
-else print ''.$langs->trans("TimeSpentByUser").' ';*/
-print ''.$langs->trans("TimeSpent").' ';
-print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?' ';
+print ''.$langs->trans("PlannedWorkload").' ';
+print ''.$langs->trans("ProgressDeclared").' ';
+/*print ''.$langs->trans("TimeSpent").' ';
+if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' ';
+else print ''.$langs->trans("TimeSpentByUser").' ';*/
+print ''.$langs->trans("TimeSpent").' ';
+print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?' ';
print ''.$langs->trans("HourStart").' ';
// By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index a293c8ee451..ca4663bd43e 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -309,17 +309,17 @@ print '';
print '';
print "".$langs->trans("Parameters")." \n";
-print ''.$langs->trans("Value").' '."\n";
+print ''.$langs->trans("Value").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("ManageOpportunitiesStatus").' ';
-print '';
+print ' ';
$arrval=array('0'=>$langs->trans("No"),
'1'=>$langs->trans("Yes"),
);
print $form->selectyesno('PROJECT_USE_OPPORTUNITIES', $conf->global->PROJECT_USE_OPPORTUNITIES, 1);
-print ' ';
+print ' ';
print ' ";
print ' ';
@@ -327,12 +327,12 @@ print '';
print '';
print ''.$langs->trans("ManageTasks").' ';
-print '';
+print ' ';
$arrval=array('0'=>$langs->trans("No"),
'1'=>$langs->trans("Yes"),
);
print $form->selectyesno('PROJECT_USE_TASKS', empty($conf->global->PROJECT_HIDE_TASKS)?1:0, 1);
-print ' ';
+print ' ';
print ' ";
print ' ';
@@ -354,8 +354,8 @@ print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("Activated").' ';
-print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Activated").' ';
+print ''.$langs->trans("ShortInfo").' ';
print " \n";
clearstatcache();
@@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print ''."\n";
- print '';
+ print ' ';
if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
{
print img_picto($langs->trans("Activated"), 'switch_on');
@@ -429,7 +429,7 @@ foreach ($dirmodels as $reldir)
}
}
- print ' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
@@ -455,8 +455,8 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
- print ''.$langs->trans("Activated").' ';
- print ''.$langs->trans("ShortInfo").' ';
+ print ''.$langs->trans("Activated").' ';
+ print ''.$langs->trans("ShortInfo").' ';
print "\n";
clearstatcache();
@@ -499,7 +499,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
else print $tmp;
print ''."\n";
- print '';
+ print ' ';
if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
{
print img_picto($langs->trans("Activated"), 'switch_on');
@@ -530,7 +530,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
}
}
- print ' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
@@ -583,10 +583,10 @@ print "\n";
print "\n";
print ' '.$langs->trans("Name")." \n";
print " ".$langs->trans("Description")." \n";
-print ''.$langs->trans("Activated")." \n";
-print ''.$langs->trans("Default")." \n";
-print ''.$langs->trans("ShortInfo").' ';
-print ''.$langs->trans("Preview").' ';
+print ''.$langs->trans("Activated")." \n";
+print ''.$langs->trans("Default")." \n";
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
print " \n";
clearstatcache();
@@ -637,7 +637,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
- print "\n";
+ print " \n";
print 'scandir.'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
@@ -645,13 +645,13 @@ foreach ($dirmodels as $reldir)
}
else
{
- print " \n";
+ print " \n";
print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
// Default
- print "";
+ print " ";
if ($conf->global->PROJECT_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"), 'on');
@@ -672,12 +672,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
$htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf')
{
print ''.img_object($langs->trans("Preview"), 'bill').' ';
@@ -740,10 +740,10 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
print " \n";
print ' '.$langs->trans("Name")." \n";
print " ".$langs->trans("Description")." \n";
- print ''.$langs->trans("Activated")." \n";
- print ''.$langs->trans("Default")." \n";
- print ''.$langs->trans("ShortInfo").' ';
- print ''.$langs->trans("Preview").' ';
+ print ''.$langs->trans("Activated")." \n";
+ print ''.$langs->trans("Default")." \n";
+ print ''.$langs->trans("ShortInfo").' ';
+ print ''.$langs->trans("Preview").' ';
print " \n";
clearstatcache();
@@ -794,7 +794,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
// Active
if (in_array($name, $def))
{
- print "\n";
+ print " \n";
print 'scandir.'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
@@ -802,13 +802,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
}
else
{
- print " \n";
+ print " \n";
print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
// Defaut
- print "";
+ print " ";
if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"), 'on');
@@ -829,12 +829,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
$htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
$htmltooltip.=' ';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf')
{
print ''.img_object($langs->trans("Preview"), 'bill').' ';
@@ -870,27 +870,27 @@ print '';
print '';
print "".$langs->trans("Parameters")." \n";
-print ''.$langs->trans("Value").' '."\n";
+print ''.$langs->trans("Value").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UseSearchToSelectProject").' ';
if (! $conf->use_javascript_ajax)
{
- print '';
+ print ' ';
print $langs->trans("NotAvailableWhenAjaxDisabled");
print " ";
}
else
{
- print '';
+ print ' ';
$arrval=array('0'=>$langs->trans("No"),
'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
);
print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
- print ' ';
+ print ' ';
print ' ";
}
@@ -899,7 +899,7 @@ print ' ';
print '';
print ''.$langs->trans("AllowToSelectProjectFromOtherCompany").' ';
-print '';
+print ' ';
print ''.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print ' ';
}
@@ -1003,7 +1003,7 @@ elseif ($object->id > 0)
// Categories
if($conf->categorie->enabled) {
- print ''.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($object->id, 'project', 1);
print " ';
+ print '
';
print '
';
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 580107c66f9..5ee207033cf 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -159,7 +159,7 @@ print '';
// Categories
if ($conf->categorie->enabled) {
- print '
' . $langs->trans("Categories") . ' ';
+ print ' ' . $langs->trans("Categories") . ' ';
print $form->showCategories($object->id, 'project', 1);
print " ";
}
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index a5372a7426e..95d5e3dd229 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -250,7 +250,7 @@ if ($id > 0 || ! empty($ref))
// Categories
if ($conf->categorie->enabled) {
- print '
'.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($object->id, 'project', 1);
print " ";
}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index d9d1ac4a603..9b393f8a1bf 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -227,7 +227,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_B
// Categories
if($conf->categorie->enabled) {
- print '
'.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($object->id, 'project', 1);
print " ";
}
@@ -563,10 +563,10 @@ print load_fiche_titre($langs->trans("Profit"), '', 'title_accountancy');
print '
';
print '';
-print ''.$langs->trans("Element").' ';
-print ''.$langs->trans("Number").' ';
-print ''.$langs->trans("AmountHT").' ';
-print ''.$langs->trans("AmountTTC").' ';
+print ''.$langs->trans("Element").' ';
+print ''.$langs->trans("Number").' ';
+print ''.$langs->trans("AmountHT").' ';
+print ''.$langs->trans("AmountTTC").' ';
print ' ';
foreach ($listofreferent as $key => $value)
@@ -676,14 +676,14 @@ foreach ($listofreferent as $key => $value)
// Module
print ''.$name.' ';
// Nb
- print ''.$i.' ';
+ print ''.$i.' ';
// Amount HT
- print '';
+ print ' ';
if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).' ';
else print price($total_ht);
print ' ';
// Amount TTC
- print '';
+ print ' ';
if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).' ';
else print price($total_ttc);
print ' ';
@@ -693,9 +693,9 @@ foreach ($listofreferent as $key => $value)
}
// and the final balance
print '';
-print ''.$langs->trans("Profit").' ';
-print ''.price(price2num($balance_ht, 'MT')).' ';
-print ''.price(price2num($balance_ttc, 'MT')).' ';
+print ''.$langs->trans("Profit").' ';
+print ''.price(price2num($balance_ht, 'MT')).' ';
+print ''.price(price2num($balance_ttc, 'MT')).' ';
print ' ';
print "
";
@@ -787,7 +787,7 @@ foreach ($listofreferent as $key => $value)
// Ref
print '
'.$langs->trans("Ref").'';
// Date
- print '';
+ print '';
if (in_array($tablename, array('projet_task'))) print $langs->trans("TimeSpent");
if (! in_array($tablename, array('projet_task'))) print $langs->trans("Date");
print '';
@@ -799,17 +799,17 @@ foreach ($listofreferent as $key => $value)
else print $langs->trans("ThirdParty");
print '';
// Amount HT
- //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("AmountHT").' ';
- //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Amount").' ';
- if (empty($value['disableamount'])) print ''.$langs->trans("AmountHT").' ';
+ //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("AmountHT").' ';
+ //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Amount").' ';
+ if (empty($value['disableamount'])) print ''.$langs->trans("AmountHT").' ';
else print ''.$langs->trans("AmountTTC").' ';
- if (empty($value['disableamount'])) print ''.$langs->trans("AmountTTC").' ';
+ //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("AmountTTC").' ';
+ if (empty($value['disableamount'])) print ''.$langs->trans("AmountTTC").' ';
else print ''.$langs->trans("ProgressDeclared").' ';
- else print ''.$langs->trans("Status").' ';
+ if (in_array($tablename, array('projet_task'))) print ''.$langs->trans("ProgressDeclared").' ';
+ else print ''.$langs->trans("Status").' ';
print '';
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet');
@@ -888,7 +888,7 @@ foreach ($listofreferent as $key => $value)
print "\n";
// Ref
- print '';
+ print ' ';
if ($tablename == 'expensereport_det')
{
print $expensereport->getNomUrl(1);
@@ -950,7 +950,7 @@ foreach ($listofreferent as $key => $value)
if (empty($date)) $date=$element->datev;
}
}
- print ' ';
+ print ' ';
if ($tablename == 'actioncomm')
{
print dol_print_date($element->datep, 'dayhour');
@@ -1027,7 +1027,7 @@ foreach ($listofreferent as $key => $value)
{
$total_ht_by_line=$element->total_ht;
}
- print ' ';
+ print ' ';
if ($othermessage) print $othermessage;
if (isset($total_ht_by_line))
{
@@ -1064,7 +1064,7 @@ foreach ($listofreferent as $key => $value)
{
$total_ttc_by_line=$element->total_ttc;
}
- print ' ';
+ print ' ';
if ($othermessage) print $othermessage;
if (isset($total_ttc_by_line))
{
@@ -1078,7 +1078,7 @@ foreach ($listofreferent as $key => $value)
else print ' ';
+ print ' ';
if ($tablename == 'expensereport_det')
{
print $expensereport->getLibStatut(5);
@@ -1129,8 +1129,8 @@ foreach ($listofreferent as $key => $value)
$breakline.=$langs->trans('SubTotal').' : ';
if (is_object($element->thirdparty)) $breakline.=$element->thirdparty->getNomUrl(0, '', 48);
$breakline.=' ';
- $breakline.=''.price($total_ht_by_third).' ';
- $breakline.=''.price($total_ttc_by_third).' ';
+ $breakline.=''.price($total_ht_by_third).' ';
+ $breakline.=''.price($total_ttc_by_third).' ';
$breakline.=''.$langs->trans("Number").': '.$i.' ';
if (in_array($tablename, array('projet_task')))
{
- print '';
+ print ' ';
print convertSecondToTime($total_time, 'allhourmin');
print ' ';
print '';
print ' ';
}
- //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalHT").' : '.price($total_ht).' ';
- //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Total").' : '.price($total_ht).' ';
- print '';
+ //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ' '.$langs->trans("TotalHT").' : '.price($total_ht).' ';
+ //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Total").' : '.price($total_ht).' ';
+ print '';
if (empty($value['disableamount']))
{
if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
}
print ' ';
- //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).' ';
- //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '';
+ //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ' '.$langs->trans("TotalTTC").' : '.price($total_ttc).' ';
+ //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '';
if (empty($value['disableamount']))
{
if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 083a3be46c0..d9a9cc37ed8 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -175,7 +175,7 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref))
// Categories
if($conf->categorie->enabled) {
- print ' '.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($object->id, 'project', 1);
print " ';
print ''.$labelstatus.' ';
- print ''.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).' '.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).' \n";
}
}
if ($conf->use_javascript_ajax)
{
- print '';
+ print ' ';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$dolgraph = new DolGraph();
@@ -92,12 +92,12 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
print ' '.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").') '.$totalinprocess.' '.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").') '.price($totalamount, 0, '', 1, -1, -1, $conf->currency).' '.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").') '.$totalinprocess.' '.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").') '.price($totalamount, 0, '', 1, -1, -1, $conf->currency).' ';
//print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
- print ' '.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).' '.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).' ';
print "
";
print "";
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 14cbaf1da1d..a4389339e46 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -221,7 +221,7 @@ if ($resql)
print ' ';
print ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -237,7 +237,7 @@ if ($resql)
}
print ' ';
print ''.dol_print_date($db->jdate($obj->datem), 'day').' ';
- print ''.$projectstatic->LibStatut($obj->fk_statut, 5).' ';
+ print ''.$projectstatic->LibStatut($obj->fk_statut, 5).' ';
print '';
$i++;
}
@@ -252,7 +252,7 @@ print '';
print '
';
print '';
print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "s.nom", "", "", '', $sortfield, $sortorder);
-print_liste_field_titre("NbOfProjects", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortorder, 'right ');
print " \n";
$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";
@@ -289,7 +289,7 @@ if ( $resql )
print $langs->trans("OthersNotLinkedToThirdParty");
}
print '';
- print '';
+ print ' ';
if ($obj->socid) print ''.$obj->nb.' ';
else print ''.$obj->nb.' ';
print ' ';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index dc4183bc6e0..06d41e8031f 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -618,13 +618,13 @@ if (! empty($arrayfields['p.opp_percent']['checked']))
}
if (! empty($arrayfields['p.budget_amount']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['p.bill_time']['checked']))
{
- print '';
+ print ' ';
print '';
print ' ';
}
@@ -649,7 +649,7 @@ if (! empty($arrayfields['p.tms']['checked']))
}
if (! empty($arrayfields['p.fk_statut']['checked']))
{
- print '';
+ print ' ';
$arrayofstatus = array();
foreach($object->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
$arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
@@ -658,7 +658,7 @@ if (! empty($arrayfields['p.fk_statut']['checked']))
print ' ';
}
// Action column
-print '';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -670,24 +670,24 @@ if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre
if (! empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['commercial']['checked'])) print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['p.dateo']['checked'])) print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['p.datee']['checked'])) print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['p.dateo']['checked'])) print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['p.datee']['checked'])) print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['p.public']['checked'])) print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, 'align="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, 'align="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, 'align="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['p.bill_time']['checked'])) print_liste_field_titre($arrayfields['p.bill_time']['label'], $_SERVER["PHP_SELF"], 'p.bill_time', "", $param, 'align="right"', $sortfield, $sortorder);
+if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+if (! empty($arrayfields['p.bill_time']['checked'])) print_liste_field_titre($arrayfields['p.bill_time']['label'], $_SERVER["PHP_SELF"], 'p.bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
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.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
$i=0;
@@ -824,7 +824,7 @@ while ($i < min($num, $limit))
// Opp Amount
if (! empty($arrayfields['p.opp_amount']['checked']))
{
- print '';
+ print ' ';
//if ($obj->opp_status_code)
if (strcmp($obj->opp_amount, ''))
{
@@ -838,7 +838,7 @@ while ($i < min($num, $limit))
// Opp percent
if (! empty($arrayfields['p.opp_percent']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->opp_percent) print price($obj->opp_percent, 1, $langs, 1, 0).'%';
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -846,7 +846,7 @@ while ($i < min($num, $limit))
// Budget
if (! empty($arrayfields['p.budget_amount']['checked']))
{
- print '';
+ print ' ';
if ($obj->budget_amount != '')
{
print price($obj->budget_amount, 1, $langs, 1, -1, -1);
@@ -859,7 +859,7 @@ while ($i < min($num, $limit))
// Bill time
if (! empty($arrayfields['p.bill_time']['checked']))
{
- print ' ';
+ print ' ';
if ($obj->bill_time)
{
print yn($obj->bill_time);
@@ -876,7 +876,7 @@ while ($i < min($num, $limit))
// Date creation
if (! empty($arrayfields['p.datec']['checked']))
{
- print ' ';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -884,7 +884,7 @@ while ($i < min($num, $limit))
// Date modification
if (! empty($arrayfields['p.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -892,11 +892,11 @@ while ($i < min($num, $limit))
// Status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
- print ''.$object->getLibStatut(5).' ';
+ print ''.$object->getLibStatut(5).' ';
if (! $i) $totalarray['nbfield']++;
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -925,8 +925,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totaloppfield'] == $i) print ''.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).' ';
- elseif ($totalarray['totalbudgetfield'] == $i) print ''.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).' ';
+ elseif ($totalarray['totaloppfield'] == $i) print ''.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).' ';
+ elseif ($totalarray['totalbudgetfield'] == $i) print ''.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).' ';
else print '
';
print '';
print '
';
@@ -305,13 +305,13 @@ print '
';
print '
';
print '
';
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfProjects").' ';
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("NbOfProjects").' ';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print ''.$langs->trans("OpportunityAmountShort").' ';
- print ''.$langs->trans("OpportunityAmountAverageShort").' ';
- print ''.$langs->trans("OpportunityAmountWeigthedShort").' ';
+ print ''.$langs->trans("OpportunityAmountShort").' ';
+ print ''.$langs->trans("OpportunityAmountAverageShort").' ';
+ print ''.$langs->trans("OpportunityAmountWeigthedShort").' ';
}
print ' ';
@@ -324,25 +324,25 @@ foreach ($data_all_year as $val)
$oldyear--;
print '';
- print '0?'&userid='.$userid:'').'">'.$oldyear.' 0?'&userid='.$userid:'').'">'.$oldyear.' 0 ';
- print '0 ';
- print '0 ';
+ print '0 ';
+ print '0 ';
+ print '0 ';
}
- print '0 ';
+ print '0 ';
print ' ';
}
print '';
- print '0?'&userid='.$userid:'').'">'.$year.' '.$val['nb'].' ';
+ print '0?'&userid='.$userid:'').'">'.$year.' '.$val['nb'].' ';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
- print ''.($val['total']?price(price2num($val['total'], 'MT'), 1):'0').' ';
- print ''.($val['avg']?price(price2num($val['avg'], 'MT'), 1):'0').' ';
- print ''.($val['weighted']?price(price2num($val['weighted'], 'MT'), 1):'0').' ';
+ print ''.($val['total']?price(price2num($val['total'], 'MT'), 1):'0').' ';
+ print ''.($val['avg']?price(price2num($val['avg'], 'MT'), 1):'0').' ';
+ print ''.($val['weighted']?price(price2num($val['weighted'], 'MT'), 1):'0').' ';
}
print ' ';
$oldyear=$year;
@@ -353,7 +353,7 @@ print '';
print '';
-$stringtoshow.= '
';
+$stringtoshow.= '';
if ($mesg) { print $mesg; }
else {
$stringtoshow.= $px1->show();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e7b99993ef1..068a26b5fe2 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -554,7 +554,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
dol_fiche_end();
- print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -712,14 +712,14 @@ elseif ($id > 0 || ! empty($ref))
// print ''.$langs->trans("Project").' ';
print_liste_field_titre("RefTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, '');
print_liste_field_titre("LabelTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, '');
- print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, '');
- print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, '');
- print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
- print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
- print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
- print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, '');
- if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', '', $sortfield, $sortorder, '');
- print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="center" width="80"', $sortfield, $sortorder, 'maxwidthsearch ');
+ print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+ if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', '', $sortfield, $sortorder);
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch ');
print "'.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print "
';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index ab1806ea461..af8dc9d39cf 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -263,7 +263,7 @@ if ($id > 0 || ! empty($ref))
// Categories
if($conf->categorie->enabled) {
- print ' '.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print " ';
$formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid');
print ' ';
- print '';
$formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid');
print ' ';
- print ''.$langs->trans("ThirdParty").' ';
print ''.$langs->trans("TaskContact").' ';
print ''.$langs->trans("ContactType").' ';
- print ''.$langs->trans("Status").' ';
+ print ''.$langs->trans("Status").' ';
print ' ';
print "\n";
@@ -493,7 +493,7 @@ if ($id > 0 || ! empty($ref))
print ''.$tab[$i]['libelle'].' ';
// Statut
- print '';
+ print ' ';
// Activation desativation du contact
if ($object->statut >= 0) print '';
print $contactstatic->LibStatut($tab[$i]['status'], 3);
@@ -501,7 +501,7 @@ if ($id > 0 || ! empty($ref))
print ' ';
// Icon update et delete
- print '';
+ print ' ';
if ($user->rights->projet->creer)
{
print ' ';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index d9832dbf1a9..49bf3d02ad8 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -206,7 +206,7 @@ if ($object->id > 0)
// Categories
if($conf->categorie->enabled) {
- print ' '.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print " ';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -574,25 +574,25 @@ print "\n";
print '';
if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $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, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="center"');
-if (! empty($arrayfields['t.progress']['checked'])) print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, 'align="center"', $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, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
+if (! empty($arrayfields['t.progress']['checked'])) print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked'])) print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['t.datec']['checked'])) print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
@@ -625,7 +625,7 @@ while ($i < min($num, $limit))
$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
if ($userAccess >= 0)
{
- print '';
+ print ' ';
// Ref
if (! empty($arrayfields['t.ref']['checked']))
@@ -697,7 +697,7 @@ while ($i < min($num, $limit))
// Project status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
- print '';
+ print ' ';
print $projectstatic->getLibStatut(1);
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -770,7 +770,7 @@ while ($i < min($num, $limit))
// Date creation
if (! empty($arrayfields['t.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -778,7 +778,7 @@ while ($i < min($num, $limit))
// Date modification
if (! empty($arrayfields['t.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -787,10 +787,10 @@ while ($i < min($num, $limit))
/*if (! empty($arrayfields['p.fk_statut']['checked']))
{
$projectstatic->statut = $obj->fk_statut;
- print ''.$projectstatic->getLibStatut(5).' ';
+ print ''.$projectstatic->getLibStatut(5).' ';
}*/
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -821,9 +821,9 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).' ';
- elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).' ';
- elseif ($totalarray['totalprogress_calculated'] == $i) print ''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').' ';
+ elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).' ';
+ elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).' ';
+ elseif ($totalarray['totalprogress_calculated'] == $i) print ''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').' ';
else print ' ';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index a0c3b517769..02925f1092f 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -186,7 +186,7 @@ if ($object->id > 0)
// Categories
if($conf->categorie->enabled) {
- print ''.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print " '.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print "
';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 1258027d615..37934aa0957 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -539,7 +539,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Categories
if ($conf->categorie->enabled) {
- print '
'.$langs->trans("Categories").' ';
+ print ' '.$langs->trans("Categories").' ';
print $form->showCategories($projectstatic->id, 'project', 1);
print " ";
}
@@ -758,7 +758,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress, 'progress', 0, 5, 0, 100, 1);
print '';
- print '
';
+ print ' ';
print ' ';
}
- print '
';
+ print ' ';
print ' ';
+ print ' ';
if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
{
print ' ';
+ print ' ';
$value = price2num($task_time->thm * $task_time->task_duration / 3600);
print price($value, 1, $langs, 1, -1, -1, $conf->currency);
print ' ';
@@ -1327,7 +1327,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Invoiced - Value billed
if (! empty($arrayfields['valuebilled']['checked']))
{
- print '
'; // invoice_id and invoice_line_id
+ print ' '; // invoice_id and invoice_line_id
if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
if ($projectstatic->bill_time)
@@ -1513,7 +1513,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Time spent
if (! empty($arrayfields['t.task_duration']['checked']))
{
- print ' ';
+ print ' ';
if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
{
print ' ';
+ print ' ';
$value = price2num($task_time->thm * $task_time->task_duration / 3600);
print price($value, 1, $langs, 1, -1, -1, $conf->currency);
print ' ';
@@ -1538,7 +1538,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Value billed
if (! empty($arrayfields['valuebilled']['checked']))
{
- print '
';
+ print ' ';
$valuebilled = price2num($task_time->total_ht);
if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
print ' ';
@@ -1661,7 +1661,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Time spent
if (! empty($arrayfields['t.task_duration']['checked']))
{
- print '
';
+ print ' ';
if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
{
print ' ';
+ print ' ';
$value = 0;
print price($value, 1, $langs, 1, -1, -1, $conf->currency);
print ' ';
@@ -1686,7 +1686,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Value billed
if (! empty($arrayfields['valuebilled']['checked']))
{
- print '
';
+ print ' ';
$valuebilled = price2num($task_time->total_ht);
if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
print ' ';
@@ -1725,9 +1725,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
if ($num < $limit && empty($offset)) print '
'.$langs->trans("Total").' ';
else print '
'.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totaldurationfield'] == $i) print '
'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' ';
- elseif ($totalarray['totalvaluefield'] == $i) print '
'.price($totalarray['totalvalue']).' ';
- //elseif ($totalarray['totalvaluebilledfield'] == $i) print '
'.price($totalarray['totalvaluebilled']).' ';
+ elseif ($totalarray['totaldurationfield'] == $i) print '
'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' ';
+ elseif ($totalarray['totalvaluefield'] == $i) print '
'.price($totalarray['totalvalue']).' ';
+ //elseif ($totalarray['totalvaluebilledfield'] == $i) print '
'.price($totalarray['totalvaluebilled']).' ';
else print '
';
}
print '';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d6b9bcd9dc9..6166aae1e8a 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -428,7 +428,7 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
'dol_version' => DOL_VERSION,
'dol_entity' => $conf->entity,
'dol_company' => $mysoc->name, // Usefull when using multicompany
- 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
+ 'ipaddress'=> getUserRemoteIP()
);
if (! empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
@@ -602,7 +602,7 @@ $charge = \Stripe\Charge::create(array(
$_SESSION["FinalPaymentAmt"] = $amount;
$_SESSION["currencyCodeType"] = $currency;
$_SESSION["paymentType"] = '';
- $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
+ $_SESSION['ipaddress'] = getUserRemoteIP(); // Payer ip
$_SESSION['payerID'] = is_object($customer)?$customer->id:'';
$_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 1661807d634..f34c88ad5ce 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -471,7 +471,7 @@ if ($action == "view_ticketlist")
if (!empty($arrayfields['category.code']['checked'])) {
print '
';
- $formTicket->selectAnalyticCodesTickets($search_category, 'search_category', '', 2, 1, 1);
+ $formTicket->selectGroupTickets($search_category, 'search_category', '', 2, 1, 1);
print ' ';
}
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index a24f85cecad..c2400abea1d 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -805,7 +805,7 @@ if ($action == 'create')
print '
';
print '' . $langs->trans("Project") . ' ';
$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print ' ';
}
@@ -989,9 +989,9 @@ if ($action == 'create')
{
print '
';
print ''.$langs->trans("Description").' ';
- print ''.$langs->trans("QtyOrdered").' ';
- print ''.$langs->trans("QtyReceived").' ';
- print ''.$langs->trans("QtyToReceive");
+ print ' '.$langs->trans("QtyOrdered").' ';
+ print ''.$langs->trans("QtyReceived").' ';
+ print ''.$langs->trans("QtyToReceive");
if (empty($conf->productbatch->enabled))
{
print ' '.$langs->trans("Fill").' ';
@@ -1085,7 +1085,7 @@ if ($action == 'create')
}
// Qty
- print ' '.$line->qty;
+ print ' '.$line->qty;
print ' ';
+ print ' ';
$quantityDelivered = $object->receptions[$line->id];
@@ -1124,7 +1124,7 @@ if ($action == 'create')
// Quantity to send
- print ' ';
+ print ' ';
if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int');
@@ -1416,7 +1416,7 @@ elseif ($id || $ref)
print $langs->trans('DateDeliveryPlanned');
print ' ';
- if ($action != 'editdate_livraison') print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).' id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'
';
print '
';
if ($action == 'editdate_livraison')
@@ -1556,7 +1556,7 @@ elseif ($id || $ref)
print $langs->trans('ReceptionMethod');
print ' ';
- if ($action != 'editshipping_method_id') print '
id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).' ';
+ if ($action != 'editshipping_method_id') print '
id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).' ';
print '
';
print '';
if ($action == 'editshipping_method_id')
@@ -1594,7 +1594,7 @@ elseif ($id || $ref)
print ' ';
print '';
print $langs->trans('IncotermLabel');
- print ' ';
+ print ' ';
if ($user->rights->reception->creer) print ''.img_edit().' ';
else print ' ';
print '
';
@@ -1637,24 +1637,24 @@ elseif ($id || $ref)
// #
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
- print ' ';
+ print ' ';
}
// Product/Service
print ''.$langs->trans("Products").' ';
// Comment
print ''.$langs->trans("Description").' ';
// Qty
- print ''.$langs->trans("QtyOrdered").' ';
+ print ''.$langs->trans("QtyOrdered").' ';
if ($origin && $origin_id > 0)
{
- print ''.$langs->trans("QtyInOtherReceptions").' ';
+ print ''.$langs->trans("QtyInOtherReceptions").' ';
}
if ($action == 'editline')
{
$editColspan = 3;
if (empty($conf->stock->enabled)) $editColspan--;
if (empty($conf->productbatch->enabled)) $editColspan--;
- print '';
+ print ' ';
if ($object->statut <= 1)
{
print $langs->trans("QtyToReceive").' - ';
@@ -1677,11 +1677,11 @@ elseif ($id || $ref)
{
if ($object->statut <= 1)
{
- print ' '.$langs->trans("QtyToReceive").' ';
+ print ''.$langs->trans("QtyToReceive").' ';
}
else
{
- print ''.$langs->trans("QtyReceived").' ';
+ print ''.$langs->trans("QtyReceived").' ';
}
if (! empty($conf->stock->enabled))
{
@@ -1693,9 +1693,9 @@ elseif ($id || $ref)
print ''.$langs->trans("Batch").' ';
}
}
- print ''.$langs->trans("CalculatedWeight").' ';
- print ''.$langs->trans("CalculatedVolume").' ';
- //print ''.$langs->trans("Size").' ';
+ print ''.$langs->trans("CalculatedWeight").' ';
+ print ''.$langs->trans("CalculatedVolume").' ';
+ //print ''.$langs->trans("Size").' ';
if ($object->statut == 0)
{
print ''.($i+1).' ';
+ print ''.($i+1).' ';
}
// Predefined product or service
@@ -1834,12 +1834,12 @@ elseif ($id || $ref)
// Qty ordered
- print ''.$lines[$i]->qty_asked.' ';
+ print ''.$lines[$i]->qty_asked.' ';
// Qty in other receptions (with reception and warehouse used)
if ($origin && $origin_id > 0)
{
- print '';
+ print ' ';
foreach ($alreadysent as $key => $val)
{
if ($lines[$i]->fk_commandefourndet == $key)
@@ -1871,7 +1871,7 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
// edit mode
- print ' ';
+ print '';
if (! empty($conf->stock->enabled))
{
if ($lines[$i]->fk_product > 0)
@@ -1912,7 +1912,7 @@ elseif ($id || $ref)
else
{
// Qty to receive or received
- print ''.$lines[$i]->qty.' ';
+ print ''.$lines[$i]->qty.' ';
// Warehouse source
if (! empty($conf->stock->enabled))
@@ -1959,13 +1959,13 @@ elseif ($id || $ref)
}
// Weight
- print '';
+ print ' ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units, "weight");
else print ' ';
print ' ';
// Volume
- print '';
+ print ' ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units, "volume");
else print ' ';
print ' ';
@@ -1973,14 +1973,14 @@ elseif ($id || $ref)
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
- print '';
+ print ' ';
print ' ';
+ print ' ';
print 'id . '">' . img_edit() . ' ';
print ' ';
print '';
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 74cc86f26a5..3b0bb7a05e0 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -160,7 +160,7 @@ if ($resql)
print ' ';
print $companystatic->getNomUrl(1, 'customer', 32);
print ' ';
- print '';
+ print ' ';
print $orderstatic->getLibStatut(3);
print ' ';
print '';
@@ -219,7 +219,7 @@ if ( $resql )
print '';
print $companystatic->getNomUrl(1, 'customer');
print ' ';
- print '';
+ print ' ';
print $orderstatic->getLibStatut(3);
print ' ';
print '';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 5cb3a100e71..3340a192081 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -647,7 +647,7 @@ if ($resql)
// Thirdparty
if (! empty($arrayfields['s.nom']['checked']))
{
- print '';
+ print ' ';
print ' ';
}
@@ -665,14 +665,14 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '';
+ print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
print ' ';
}
// Company type
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
print ' ';
}
@@ -735,19 +735,19 @@ if ($resql)
// Status
if (! empty($arrayfields['e.fk_statut']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')), $viewstatut, 1);
print ' ';
}
// Status billed
if (! empty($arrayfields['e.billed']['checked']))
{
- print '';
+ print ' ';
print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
print ' ';
}
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -756,15 +756,15 @@ if ($resql)
print '';
if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['e.ref_supplier']['checked'])) print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"], "e.ref_supplier", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, 'align="left"', $sortfield, $sortorder);
+ if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -775,7 +775,7 @@ if ($resql)
$align=$extrafields->getAlignFlag($key);
$sortonfield = "ef.".$key;
if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
- print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder);
+ print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, '', $sortfield, $sortorder, ($align?'"'.$align.' "':''));
}
}
}
@@ -783,11 +783,11 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
$i=0;
@@ -862,7 +862,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '';
+ print ' ';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print ' ';
@@ -871,7 +871,7 @@ if ($resql)
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print ' ';
@@ -881,7 +881,7 @@ if ($resql)
// Date delivery planed
if (! empty($arrayfields['e.date_delivery']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_livraison), "day");
/*$now = time();
if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
@@ -907,7 +907,7 @@ if ($resql)
if (! empty($arrayfields['l.date_delivery']['checked']))
{
// Date received
- print ' ';
+ print ' ';
print dol_print_date($db->jdate($obj->date_reception), "day");
print ' '."\n";
}
@@ -920,10 +920,10 @@ if ($resql)
{
if (! empty($arrayfields["ef.".$key]['checked']))
{
- print '';
@@ -938,7 +938,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['e.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -946,7 +946,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['e.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -954,18 +954,18 @@ if ($resql)
// Status
if (! empty($arrayfields['e.fk_statut']['checked']))
{
- print ''.$reception->LibStatut($obj->fk_statut, 5).' ';
+ print ''.$reception->LibStatut($obj->fk_statut, 5).' ';
if (! $i) $totalarray['nbfield']++;
}
// Billed
if (! empty($arrayfields['e.billed']['checked']))
{
- print ''.yn($obj->billed).' ';
+ print ''.yn($obj->billed).' ';
if (! $i) $totalarray['nbfield']++;
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index b4034588218..94e77c3c4b5 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -255,7 +255,7 @@ print '';
arsort($arrayyears);
print $form->selectarray('year', $arrayyears, $year, 0);
print '
';
- print '
';
print '';
print '';
print '
';
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfReceptions").' ';
-/*print ''.$langs->trans("AmountTotal").' ';
-print ''.$langs->trans("AmountAverage").' ';*/
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("NbOfReceptions").' ';
+/*print ''.$langs->trans("AmountTotal").' ';
+print ''.$langs->trans("AmountAverage").' ';*/
print ' ';
$oldyear=0;
@@ -279,22 +279,22 @@ foreach ($data as $val)
print '';
- print ''.$oldyear.' '.$oldyear.' 0 ';
- /*print '0 ';
- print '0 ';*/
+ print '0 ';
+ /*print '0 ';
+ print '0 ';*/
print ' ';
}
print '';
- print '';
+ print ' ';
if ($year) print ''.$year.' ';
else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
print ' ';
- print ''.$val['nb'].' ';
- /*print ''.price(price2num($val['total'],'MT'),1).' ';
- print ''.price(price2num($val['avg'],'MT'),1).' ';*/
+ print ''.$val['nb'].' ';
+ /*print ''.price(price2num($val['total'],'MT'),1).' ';
+ print ''.price(price2num($val['avg'],'MT'),1).' ';*/
print ' ';
$oldyear=$year;
}
@@ -306,7 +306,7 @@ print '';
// Show graphs
-print '
';
+print '';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -328,8 +328,8 @@ dol_fiche_end();
// TODO USe code similar to commande/stats/index.php instead of this one.
/*
print '';
-print ''.$langs->trans("Year").' ';
-print ''.$langs->trans("NbOfReceptions").' '.$langs->trans("Year").' ';
+print ''.$langs->trans("NbOfReceptions").' ";
- print ''.$year.' '.$nbproduct.' ';
+ print ''.$year.' '.$nbproduct.' ';
$i++;
}
}
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index e67768e6ceb..84eb9126464 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -65,8 +65,8 @@ if (! $mesg)
}
print '';
-print 'Nombre d reception par mois ';
-print '';
+print ' Nombre d reception par mois ';
+print '';
print $px->show();
print '
';
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index bd12cbd2902..9601c661c70 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -41,14 +41,14 @@ foreach($linkedObjectBlock as $key => $objectlink)
trans("Reception"); ?>
getNomUrl(1); ?>
date_delivery, 'day'); ?>
- date_delivery, 'day'); ?>
+ rights->reception->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?>
- getLibStatut(3); ?>
-
+ getLibStatut(3); ?>
+
element != 'order_supplier') {
@@ -66,11 +66,11 @@ if (count($linkedObjectBlock) > 1)
trans("Total"); ?>
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -85,7 +86,7 @@ class FormResource
$resourcestat = new Dolresource($this->db);
- $resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, $offset, $filter);
+ $resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
if ($outputmode != 2)
{
@@ -194,17 +195,17 @@ class FormResource
if ($empty && empty($arraytypes['code'])) continue;
if ($format == 0) print '';
if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
- if ($format == 1) $value=$arraytypes['code'];
- if ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
- if ($format == 3) $value=$arraytypes['code'];
+ elseif ($format == 1) $value=$arraytypes['code'];
+ elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+ elseif ($format == 3) $value=$arraytypes['code'];
print $value?$value:' ';
print ' ';
}
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 8e850004669..800c5edcb06 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -226,18 +226,18 @@ if (! empty($arrayfields['ty.label']['checked']))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Action column
-print '';
+print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
print "\n";
print '';
-if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
@@ -266,7 +266,7 @@ if ($ret)
$obj = (Object) $resource->array_options;
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- print '';
+ print ' ';
print '';
print img_edit();
print ' ';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index ba6d8522ccf..4a614c02312 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -356,8 +356,8 @@ print ' '."\n";
print ' '.$langs->trans("Name").' ';
print ' '.$langs->trans("Description").' ';
print ' '.$langs->trans("Example").' ';
-print ' '.$langs->trans("Status").' ';
-print ' '.$langs->trans("ShortInfo").' ';
+print ' '.$langs->trans("Status").' ';
+print ' '.$langs->trans("ShortInfo").' ';
print " \n";
foreach ($dirsociete as $dirroot)
@@ -395,7 +395,7 @@ foreach ($dirsociete as $dirroot)
if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
{
- print ''."\n";
+ print ' '."\n";
print img_picto($langs->trans("Activated"), 'switch_on');
print " \n";
}
@@ -403,14 +403,14 @@ foreach ($dirsociete as $dirroot)
{
$disabled = false;
if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
- print '';
+ print ' ';
if (! $disabled) print '';
print img_picto($langs->trans("Disabled"), 'switch_off');
if (! $disabled) print ' ';
print ' ';
}
- print '';
+ print ' ';
$s=$modCodeTiers->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print ' ';
@@ -437,8 +437,8 @@ print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Example").' ';
-print ''.$langs->trans("Status").' ';
-print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
print " \n";
foreach ($dirsociete as $dirroot)
@@ -472,17 +472,17 @@ foreach ($dirsociete as $dirroot)
if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
{
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
}
else
{
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
+ print ' ';
$s=$modCodeCompta->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print ' ';
@@ -530,9 +530,9 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Status").' ';
-print ''.$langs->trans("ShortInfo").' ';
-print ''.$langs->trans("Preview").' ';
+print ''.$langs->trans("Status").' ';
+print ''.$langs->trans("ShortInfo").' ';
+print ''.$langs->trans("Preview").' ';
print " \n";
foreach ($dirsociete as $dirroot)
@@ -577,7 +577,7 @@ foreach ($dirsociete as $dirroot)
// Activate / Disable
if (in_array($name, $def))
{
- print "\n";
+ print " \n";
//if ($conf->global->COMPANY_ADDON_PDF != "$name")
//{
print 'scandir.'&label='.urlencode($module->name).'">';
@@ -594,13 +594,13 @@ foreach ($dirsociete as $dirroot)
{
if (versioncompare($module->phpmin, versionphparray()) > 0)
{
- print " \n";
+ print " \n";
print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
print " ";
}
else
{
- print "\n";
+ print " \n";
print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -616,12 +616,12 @@ foreach ($dirsociete as $dirroot)
$htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
$htmltooltip.='';
+ print ' ';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
// Preview
- print '';
+ print ' ';
if ($module->type == 'pdf')
{
$linkspec=''.img_object($langs->trans("Preview"), 'bill').' ';
@@ -653,9 +653,9 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("MustBeUnique").' ';
-print ''.$langs->trans("MustBeMandatory").' ';
-print ''.$langs->trans("MustBeInvoiceMandatory").' ';
+print ''.$langs->trans("MustBeUnique").' ';
+print ''.$langs->trans("MustBeMandatory").' ';
+print ''.$langs->trans("MustBeInvoiceMandatory").' ';
print " \n";
$profid['IDPROF1'][0]=$langs->trans("ProfId1");
@@ -693,39 +693,39 @@ foreach($profid as $key => $val)
if ($verif)
{
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
print '
';
print '';
print "".$langs->trans("Parameters")." \n";
-print ''.$langs->trans("Value").' '."\n";
+print ''.$langs->trans("Value").' '."\n";
print ' '."\n";
// Utilisation formulaire Ajax sur choix societe
@@ -762,20 +762,20 @@ print '';
print ''.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"), $langs->trans('UseSearchToSelectCompanyTooltip'), 1).' ';
if (! $conf->use_javascript_ajax)
{
- print '';
+ print ' ';
print $langs->trans("NotAvailableWhenAjaxDisabled");
print " ";
}
else
{
- print '';
+ print ' ';
$arrval=array('0'=>$langs->trans("No"),
'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
);
print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
- print ' ';
+ print ' ';
print ' ";
}
@@ -786,20 +786,20 @@ print ' ';
print ''.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"), $langs->trans('UseSearchToSelectContactTooltip'), 1).' ';
if (! $conf->use_javascript_ajax)
{
- print '';
+ print ' ';
print $langs->trans("NotAvailableWhenAjaxDisabled");
print " ";
}
else
{
- print '';
+ print ' ';
$arrval=array('0'=>$langs->trans("No"),
'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
);
print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
- print ' ';
+ print ' ';
print ' ";
}
@@ -810,7 +810,7 @@ print ' ';
print '';
print ''.$langs->trans("AddRefInList").' ';
print ' ';
-print '';
+print ' ';
if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
{
print '';
@@ -827,7 +827,7 @@ print ' ';
print '';
print ''.$langs->trans("AddAdressInList").' ';
print ' ';
-print '';
+print ' ';
if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
{
print '';
@@ -846,7 +846,7 @@ print ' ';
print '';
print ''.$langs->trans("AskForPreferredShippingMethod").' ';
print ' ';
-print '';
+print ' ';
if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
{
print '';
@@ -864,7 +864,7 @@ print ' ';
print '';
print ''.$langs->trans("DisableProspectCustomerType").' ';
print ' ';
-print '';
+print ' ';
if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
{
print '';
@@ -884,7 +884,7 @@ print ' '.$langs->trans("DefaultCustomerType").' ';
print '';
print $formcompany->selectProspectCustomerType($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT, 'defaultcustomertype', 'defaultcustomertype', 'admin');
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 5007fe32af4..b2921b3108f 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -203,7 +203,7 @@ for ($i=1; $i<=4; $i++) {
-
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index c00264be70c..7cb956e7b8c 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -216,7 +216,7 @@ for ($i=1; $i<=4; $i++) {
+
">
">
@@ -224,4 +224,4 @@ for ($i=1; $i<=4; $i++) {
-
\ No newline at end of file
+
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index d75f4ccb464..46990231339 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -183,7 +183,7 @@ for ($i=1; $i<=4; $i++) {
trans('RIB'); ?>
-
+
rights->societe->creer) { ?>
control->tpl['image_edit']; ?>
@@ -201,7 +201,7 @@ for ($i=1; $i<=4; $i++) {
trans('ParentCompany'); ?>
-
+
@@ -215,7 +215,7 @@ for ($i=1; $i<=4; $i++) {
trans('SalesRepresentatives'); ?>
-
+
rights->societe->creer) { ?>
control->tpl['image_edit']; ?>
@@ -288,4 +288,4 @@ $result=show_contacts($conf, $langs, $db, $soc);
$result=show_projects($conf, $langs, $db, $soc);
?>
-
\ No newline at end of file
+
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index b1d02006f16..9b401cbccb1 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -178,7 +178,7 @@ if (empty($conf) || ! is_object($conf))
-
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index a26c834d355..10acd48aca8 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -178,7 +178,7 @@ if ($this->control->tpl['fournisseur']) {
+
">
">
@@ -186,4 +186,4 @@ if ($this->control->tpl['fournisseur']) {
-
\ No newline at end of file
+
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index a5b247029c7..72514734fc1 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -142,7 +142,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
trans('RIB'); ?>
-
+
rights->societe->creer) { ?>
control->tpl['image_edit']; ?>
@@ -160,7 +160,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
trans('SalesRepresentatives'); ?>
-
+
rights->societe->creer) { ?>
control->tpl['image_edit']; ?>
@@ -232,4 +232,4 @@ $result=show_contacts($conf, $langs, $db, $object);
$result=show_projects($conf, $langs, $db, $object);
?>
-
\ No newline at end of file
+
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index a8a41527af0..e5caac88387 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -146,7 +146,7 @@ if (empty($reshook))
$object->client = $object->client | $soc_origin->client;
$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
$listofproperties=array(
- 'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'url', 'barcode',
+ 'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'linkedin', 'url', 'barcode',
'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
@@ -407,6 +407,7 @@ if (empty($reshook))
$object->skype = GETPOST('skype', 'alpha');
$object->twitter = GETPOST('twitter', 'alpha');
$object->facebook = GETPOST('facebook', 'alpha');
+ $object->linkedin = GETPOST('linkedin', 'alpha');
$object->phone = GETPOST('phone', 'alpha');
$object->fax = GETPOST('fax', 'alpha');
$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
@@ -970,6 +971,7 @@ else
$object->skype = GETPOST('skype', 'alpha');
$object->twitter = GETPOST('twitter', 'alpha');
$object->facebook = GETPOST('facebook', 'alpha');
+ $object->linkedin = GETPOST('linkedin', 'alpha');
$object->phone = GETPOST('phone', 'alpha');
$object->fax = GETPOST('fax', 'alpha');
$object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
@@ -1304,13 +1306,21 @@ else
print ' ';
}
// Facebook
- if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
- {
- print ''.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
- print '';
- print ' '.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
+ print '';
+ print ' '.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).' ';
+ print '';
+ print ' '.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).' ';
print ''.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).' ';
+ print '';
+ print '
';
print '
';
print ' ';
print '
';
@@ -2506,7 +2523,7 @@ else
print '
';
print '';
print $langs->trans('IncotermLabel');
- print ' ';
+ print ' ';
if ($user->rights->societe->creer) print ''.img_edit('', 1).' ';
else print ' ';
print '
';
@@ -2545,7 +2562,7 @@ else
print '';
print ' ';
if ($action == 'editparentcompany')
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 5b29e92b6dd..e6ba5c8beac 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -1,5 +1,6 @@
+/* Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -177,16 +178,17 @@ class Contacts extends DolibarrApi
{
$num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
+ $i = 0;
while ($i < $min)
{
$obj = $db->fetch_object($result);
$contact_static = new Contact($db);
if ($contact_static->fetch($obj->rowid))
{
- if ($includecount)
- {
- $contact_static->load_ref_elements();
- }
+ if ($includecount)
+ {
+ $contact_static->load_ref_elements();
+ }
$obj_ret[] = $this->_cleanObjectDatas($contact_static);
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4c964f591d0..1aacca2c895 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -203,6 +203,11 @@ class Societe extends CommonObject
* @var string
*/
public $facebook;
+ /**
+ * LinkedIn username
+ * @var string
+ */
+ public $linkedin;
/**
* Webpage
* @var string
@@ -848,6 +853,7 @@ class Societe extends CommonObject
$this->skype = trim($this->skype);
$this->twitter = trim($this->twitter);
$this->facebook = trim($this->facebook);
+ $this->linkedin = trim($this->linkedin);
$this->url = $this->url?clean_url($this->url, 0):'';
$this->note_private = trim($this->note_private);
$this->note_public = trim($this->note_public);
@@ -991,6 +997,7 @@ class Societe extends CommonObject
$sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
$sql .= ",twitter = ".(! empty($this->twitter)?"'".$this->db->escape($this->twitter)."'":"null");
$sql .= ",facebook = ".(! empty($this->facebook)?"'".$this->db->escape($this->facebook)."'":"null");
+ $sql .= ",linkedin = ".(! empty($this->linkedin)?"'".$this->db->escape($this->linkedin)."'":"null");
$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
$sql .= ",parent = " . ($this->parent > 0 ? $this->parent : "null");
@@ -1132,6 +1139,7 @@ class Societe extends CommonObject
$lmember->skype=$this->skype;
$lmember->twitter=$this->twitter;
$lmember->facebook=$this->facebook;
+ $lmember->linkedin=$this->linkedin;
$lmember->phone=$this->phone;
$result=$lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
@@ -1235,7 +1243,7 @@ class Societe extends CommonObject
$sql .= ', s.status';
$sql .= ', s.price_level';
$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
- $sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
+ $sql .= ', s.phone, s.fax, s.email, s.skype, s.twitter, s.facebook, s.linkedin, s.url, s.zip, s.town, s.note_private, s.note_public, s.model_pdf, s.client, s.fournisseur';
$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
$sql .= ', s.capital, s.tva_intra';
$sql .= ', s.fk_typent as typent_id';
@@ -1332,6 +1340,7 @@ class Societe extends CommonObject
$this->skype = $obj->skype;
$this->twitter = $obj->twitter;
$this->facebook = $obj->facebook;
+ $this->linkedin = $obj->linkedin;
$this->url = $obj->url;
$this->phone = $obj->phone;
$this->fax = $obj->fax;
@@ -2010,16 +2019,16 @@ class Societe extends CommonObject
$name=$this->name?$this->name:$this->nom;
- if(!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
- if(empty($option) && $this->client > 0) $option = 'customer';
- if(empty($option) && $this->fournisseur > 0) $option = 'supplier';
+ if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)){
+ if (empty($option) && $this->client > 0) $option = 'customer';
+ if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
}
if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
{
$code = '';
- if (($this->client) && (! empty ($this->code_client))
+ if (($this->client) && (! empty($this->code_client))
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
)
@@ -2028,7 +2037,7 @@ class Societe extends CommonObject
$code = $this->code_client . ' - ';
}
- if (($this->fournisseur) && (! empty ($this->code_fournisseur))
+ if (($this->fournisseur) && (! empty($this->code_fournisseur))
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
)
@@ -2176,7 +2185,7 @@ class Societe extends CommonObject
}
$result.=$linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valignmiddle"'), 0, 0, $notooltip?0:1);
if ($withpicto != 2) $result.=($maxlen?dol_trunc($name, $maxlen):$name);
$result.=$linkend;
@@ -3337,6 +3346,7 @@ class Societe extends CommonObject
$this->skype=$member->skype;
$this->twitter=$member->twitter;
$this->facebook=$member->facebook;
+ $this->linkedin=$member->linkedin;
$this->client = 1; // A member is a customer by default
$this->code_client = ($customercode?$customercode:-1);
@@ -3480,6 +3490,7 @@ class Societe extends CommonObject
$this->skype='tom.hanson';
$this->twitter='tomhanson';
$this->facebook='tomhanson';
+ $this->linkedin='tomhanson';
$this->url='http://www.specimen.com';
$this->phone='0909090901';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 225dacd4a38..5d7bd6e70ad 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -380,23 +380,23 @@ if ($sql_select)
// Filters
print '';
- print '';
+ print ' ';
print ' ';
print ''; // date
print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle');
$formother->select_year($year?$year:-1, 'year', 1, 20, 1);
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
print ' ';
- print '';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -404,13 +404,13 @@ if ($sql_select)
// Titles with sort buttons
print ' ';
- print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
- print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
print " \n";
@@ -432,10 +432,10 @@ if ($sql_select)
print '';
print $documentstatic->getNomUrl(1);
print ' ';
- print ''.dol_print_date($db->jdate($objp->dateprint), 'day').' ';
+ print ''.dol_print_date($db->jdate($objp->dateprint), 'day').' ';
// Status
- print '';
+ print ' ';
if ($type_element == 'contract')
{
print $documentstaticline->getLibStatut(2);
@@ -596,13 +596,13 @@ if ($sql_select)
//print ' '.$prodreftxt.' ';
- print ''.$objp->prod_qty.' ';
+ print ''.$objp->prod_qty.' ';
$total_qty+=$objp->prod_qty;
- print ''.price($objp->total_ht).' ';
+ print ''.price($objp->total_ht).' ';
$total_ht+=$objp->total_ht;
- print ''.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).' ';
+ print ''.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).' ';
print " \n";
$i++;
@@ -611,9 +611,9 @@ if ($sql_select)
print '
';
print '' . $langs->trans('Total') . ' ';
print '' . $total_qty . ' ';
- print '' . price($total_ht) . ' ';
- print '' . price($total_ht/(empty($total_qty)?1:$total_qty)) . ' ';
+ print '' . $total_qty . ' ';
+ print '' . price($total_ht) . ' ';
+ print '' . price($total_ht/(empty($total_qty)?1:$total_qty)) . ' ';
print "
";
print '';
@@ -629,11 +629,11 @@ elseif (empty($type_element) || $type_element == -1)
print ''."\n";
// Titles with sort buttons
print '';
- print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
- print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
print " \n";
print ''.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).' '."\n";
print ''.$langs->trans("Statistics").' ';
+ print ' ';
$dataseries=array();
if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array($langs->trans("Prospects"), round($third['prospect']));
if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array($langs->trans("Customers"), round($third['customer']));
@@ -154,25 +154,25 @@ else
if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
{
$statstring = " ";
- $statstring.= ''.$langs->trans("Prospects").' '.round($third['prospect']).' ';
+ $statstring.= ''.$langs->trans("Prospects").' '.round($third['prospect']).' ';
$statstring.= " ";
}
if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
{
$statstring.= "";
- $statstring.= ''.$langs->trans("Customers").' '.round($third['customer']).' ';
+ $statstring.= ''.$langs->trans("Customers").' '.round($third['customer']).' ';
$statstring.= " ";
}
if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire)
{
$statstring2 = "";
- $statstring2.= ''.$langs->trans("Suppliers").' '.round($third['supplier']).' ';
+ $statstring2.= ''.$langs->trans("Suppliers").' '.round($third['supplier']).' ';
$statstring2.= " ";
}
print $statstring;
print $statstring2;
}
-print ''.$langs->trans("UniqueThirdParties").' ';
+print ' '.$langs->trans("UniqueThirdParties").' ';
print $total;
print '
';
@@ -188,7 +188,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
print '';
print '
';
print ''.$langs->trans("Categories").' ';
+ print ' ';
$sql = "SELECT c.label, count(*) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -249,7 +249,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
}
}
print ' '.$langs->trans("Total").' ';
+ print ' '.$langs->trans("Total").' ';
print $total;
print '
';
@@ -321,7 +321,7 @@ if ($result)
print $thirdparty_static->getNomUrl(1);
print "\n";
// Type
- print '
';
+ print ' ';
if ($thirdparty_static->client==1 || $thirdparty_static->client==3)
{
$thirdparty_static->name=$langs->trans("Customer");
@@ -341,10 +341,10 @@ if ($result)
}
print ' ';
// Last modified date
- print '
';
+ print ' ';
print dol_print_date($thirdparty_static->datem, 'day');
print " ";
- print '
';
+ print ' ';
print $thirdparty_static->getLibStatut(3);
print " ";
print "\n";
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 99a7dbd9a1c..cf42b59f558 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -737,21 +737,21 @@ if (! empty($arrayfields['region.nom']['checked']))
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '
';
+ print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
print ' ';
}
// Company type
if (! empty($arrayfields['typent.code']['checked']))
{
- print '
';
+ print ' ';
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
print ' ';
}
// Staff
if (! empty($arrayfields['staff.code']['checked']))
{
- print '
';
+ print ' ';
print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100');
print ' ';
}
@@ -836,7 +836,7 @@ if (! empty($arrayfields['s.tva_intra']['checked']))
// Type (customer/prospect/supplier)
if (! empty($arrayfields['customerorsupplier']['checked']))
{
- print '
';
+ print ' ';
if ($type != '') print ' ';
@@ -844,14 +844,14 @@ if (! empty($arrayfields['customerorsupplier']['checked']))
// Prospect level
if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
{
- print '
';
+ print ' ';
print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
print ' ';
}
// Prospect status
if (! empty($arrayfields['s.fk_stcomm']['checked']))
{
- print '
';
+ print ' ';
$arraystcomm=array();
foreach($prospectstatic->cacheprospectstatus as $key => $val)
{
@@ -862,7 +862,7 @@ if (! empty($arrayfields['s.fk_stcomm']['checked']))
}
if (! empty($arrayfields['s2.nom']['checked']))
{
- print ' ';
+ print ' ';
print ' ';
}
@@ -899,7 +899,7 @@ if (! empty($arrayfields['s.import_key']['checked']))
print '';
}
// Action column
-print '
';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -919,35 +919,35 @@ if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titr
if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['region.nom']['checked'])) print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['staff.code']['checked'])) print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['staff.code']['checked'])) print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['s.email']['checked'])) print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.phone']['checked'])) print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.fax']['checked'])) print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.url']['checked'])) print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['s.siren']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.siret']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.ape']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.idprof4']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, 'class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.tva_intra']['checked'])) print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'class="nowrap"', $sortfield, $sortorder);
+if (! empty($arrayfields['s.siren']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.siret']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.ape']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.idprof4']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+if (! empty($arrayfields['s.tva_intra']['checked'])) print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap ');
if (! empty($arrayfields['customerorsupplier']['checked'])) print_liste_field_titre(''); // type of customer
-if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['s2.nom']['checked'])) print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['s2.nom']['checked'])) print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-if (! empty($arrayfields['s.datec']['checked'])) print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.tms']['checked'])) print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (! empty($arrayfields['s.datec']['checked'])) print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['s.tms']['checked'])) print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
@@ -1057,7 +1057,7 @@ while ($i < min($num, $limit))
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '
';
+ print ' ';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print ' ';
@@ -1066,7 +1066,7 @@ while ($i < min($num, $limit))
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
- print '
';
+ print ' ';
if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print ' ';
@@ -1075,7 +1075,7 @@ while ($i < min($num, $limit))
// Staff
if (! empty($arrayfields['staff.code']['checked']))
{
- print '
';
+ print ' ';
if (! is_array($staffArray) || count($staffArray)==0) $staffArray = $formcompany->effectif_array(1);
print $staffArray[$obj->staff_code];
print ' ';
@@ -1139,7 +1139,7 @@ while ($i < min($num, $limit))
// Type
if (! empty($arrayfields['customerorsupplier']['checked']))
{
- print '
';
+ print ' ';
$s='';
if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
{
@@ -1169,7 +1169,7 @@ while ($i < min($num, $limit))
if (! empty($arrayfields['s.fk_prospectlevel']['checked']))
{
// Prospect level
- print ' ';
+ print ' ';
print $companystatic->getLibProspLevel();
print " ";
if (! $i) $totalarray['nbfield']++;
@@ -1178,7 +1178,7 @@ while ($i < min($num, $limit))
if (! empty($arrayfields['s.fk_stcomm']['checked']))
{
// Prospect status
- print '
';
+ print '
';
print '
'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']);
print '
-
';
foreach($prospectstatic->cacheprospectstatus as $key => $val)
@@ -1193,7 +1193,7 @@ while ($i < min($num, $limit))
// Parent company
if (! empty($arrayfields['s2.nom']['checked']))
{
- print '
';
+ print ' ';
if ($companystatic->fk_parent > 0)
{
$companyparent->fetch($companystatic->fk_parent);
@@ -1211,7 +1211,7 @@ while ($i < min($num, $limit))
// Date creation
if (! empty($arrayfields['s.datec']['checked']))
{
- print ' ';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -1219,7 +1219,7 @@ while ($i < min($num, $limit))
// Date modification
if (! empty($arrayfields['s.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -1227,7 +1227,7 @@ while ($i < min($num, $limit))
// Status
if (! empty($arrayfields['s.status']['checked']))
{
- print ''.$companystatic->getLibStatut(3).' ';
+ print ''.$companystatic->getLibStatut(3).' ';
if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['s.import_key']['checked']))
@@ -1239,7 +1239,7 @@ while ($i < min($num, $limit))
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 47f25172e59..59c43551f41 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -260,7 +260,7 @@ if ($result > 0)
$type=array('email'=>$langs->trans("EMail"));
print $form->selectarray("typeid", $type);
print ' ';
- print '';
- print '
'.img_delete().' ';
+ print '
'.img_delete().' ';
print '';
$i++;
}
@@ -394,7 +394,7 @@ if ($result > 0)
print '
';
print $langs->trans("Email");
print ' ';
- print '
'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).' ';
+ print '
'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).' ';
print '';
}*/
@@ -471,7 +471,7 @@ if ($result > 0)
print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
- print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
print '';
if ($num > 0)
@@ -516,7 +516,7 @@ if ($result > 0)
}
print '
';*/
// print
- print'
'.dol_print_date($db->jdate($obj->daten), 'dayhour').' ';
+ print'
'.dol_print_date($db->jdate($obj->daten), 'dayhour').' ';
print '';
$i++;
}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 20df70fda70..fff105d5985 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -772,7 +772,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
}
print '
'.img_picto($langs->trans('ShowInStripe'), 'object_globe').' ';
}
- print '
';
+ print ' ';
if (empty($stripecu))
{
print ' ';
// Default
- print '
';
+ print ' ';
if (empty($companypaymentmodetemp->default_rib))
{
print '';
@@ -927,7 +927,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print ' ';
+ print ' ';
if ($user->rights->societe->creer)
{
if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref))
@@ -1034,7 +1034,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
}
print ' ';
// Default
- print '
';
+ print ' ';
if (($customerstripe->default_source != $src->id))
{
print '';
@@ -1057,7 +1057,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print ' ';
+ print ' ';
if ($user->rights->societe->creer)
{
print '';
@@ -1103,8 +1103,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print print_liste_field_titre("RUM");
print print_liste_field_titre("WithdrawMode");
}
- print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"');
- print_liste_field_titre('', '', '', '', '', 'align="center"');
+ print_liste_field_titre("DefaultRIB", '', '', '', '', '', '', '', 'center ');
+ print_liste_field_titre('', '', '', '', '', '', '', '', 'center ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -1177,7 +1177,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
}
// Default
- print ' ';
+ print ' ';
if (!$rib->default_rib) {
print '';
print img_picto($langs->trans("Disabled"), 'off');
@@ -1188,7 +1188,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print ' ';
// Generate doc
- print '
';
+ print ' ';
$buttonlabel = $langs->trans("BuildDoc");
$forname='builddocrib'.$rib->id;
@@ -1244,7 +1244,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print ' ';
// Edit/Delete
- print '
';
+ print ' ';
if ($user->rights->societe->creer)
{
print '';
@@ -1436,7 +1436,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
dol_fiche_end();
- print '
';
- print '';
+ print '
';
print '
';
print ' ';
print '
';
@@ -440,13 +440,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '
';
print '' . $langs->trans("Product") . ' ';
print '' . $langs->trans("AppliedPricesFrom") . ' ';
- print '' . $langs->trans("PriceBase") . ' ';
- print '' . $langs->trans("VAT") . ' ';
- print '' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("ChangedBy") . ' ';
+ print '' . $langs->trans("PriceBase") . ' ';
+ print '' . $langs->trans("VAT") . ' ';
+ print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("ChangedBy") . ' ';
print ' ';
print ' ';
@@ -459,17 +459,17 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print "
" . $staticprod->getNomUrl(1) . " ";
print "
" . dol_print_date($line->datec, "dayhour") . " ";
- print '
' . $langs->trans($line->price_base_type) . " ";
- print '
' . vatrate($line->tva_tx, true, $line->recuperableonly) . " ";
- print '
' . price($line->price) . " ";
- print '
' . price($line->price_ttc) . " ";
- print '
' . price($line->price_min) . ' ';
- print '
' . price($line->price_min_ttc) . ' ';
+ print '
' . $langs->trans($line->price_base_type) . " ";
+ print '
' . vatrate($line->tva_tx, true, $line->recuperableonly) . " ";
+ print '
' . price($line->price) . " ";
+ print '
' . price($line->price_ttc) . " ";
+ print '
' . price($line->price_min) . ' ';
+ print '
' . price($line->price_min_ttc) . ' ';
// User
$userstatic = new User($db);
$userstatic->fetch($line->fk_user);
- print '
';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
}
@@ -529,13 +529,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '
';
print '' . $langs->trans("Product") . ' ';
print '' . $langs->trans("AppliedPricesFrom") . ' ';
- print '' . $langs->trans("PriceBase") . ' ';
- print '' . $langs->trans("VAT") . ' ';
- print '' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
- print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
- print '' . $langs->trans("ChangedBy") . ' ';
+ print '' . $langs->trans("PriceBase") . ' ';
+ print '' . $langs->trans("VAT") . ' ';
+ print '' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ' ';
+ print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . ' ';
+ print '' . $langs->trans("ChangedBy") . ' ';
print ' ';
print ' ';
@@ -545,7 +545,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '
';
print '
';
// Print the search button
- print '
';
+ print ' ';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print ' ';
@@ -564,24 +564,24 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print "
" . $staticprod->getNomUrl(1) . " ";
print "
" . dol_print_date($line->datec, "dayhour") . " ";
- print '
' . $langs->trans($line->price_base_type) . " ";
- print '
' . vatrate($line->tva_tx.($line->default_vat_code?' ('.$line->default_vat_code.')':''), true, $line->recuperableonly) . " ";
- print '
' . price($line->price) . " ";
- print '
' . price($line->price_ttc) . " ";
- print '
' . price($line->price_min) . ' ';
- print '
' . price($line->price_min_ttc) . ' ';
+ print '
' . $langs->trans($line->price_base_type) . " ";
+ print '
' . vatrate($line->tva_tx.($line->default_vat_code?' ('.$line->default_vat_code.')':''), true, $line->recuperableonly) . " ";
+ print '
' . price($line->price) . " ";
+ print '
' . price($line->price_ttc) . " ";
+ print '
' . price($line->price_min) . ' ';
+ print '
' . price($line->price_min_ttc) . ' ';
// User
$userstatic = new User($db);
$userstatic->fetch($line->fk_user);
- print '
';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
// Action
if ($user->rights->produit->creer || $user->rights->service->creer)
{
- print '
';
+ print ' ';
print 'id . '&prodid=' . $line->fk_product . '">';
print img_info();
print ' ';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index c86a23c9827..193703a8468 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -249,7 +249,7 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
- print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", '', $sortfield, $sortorder, 'center ');
print " \n";
$i=0;
@@ -305,7 +305,7 @@ if ($id > 0 || ! empty($ref))
// End of subscription date
if ($datefin)
{
- print '';
+ print ' ';
print dol_print_date($datefin, 'day');
if ($memberstatic->hasDelay()) {
print " ".img_warning($langs->trans("SubscriptionLate"));
@@ -314,7 +314,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print ' ';
+ print ' ';
if ($objp->subscription == 'yes')
{
print $langs->trans("SubscriptionNotReceived");
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index ce25f23694f..d106e42aa3f 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -389,7 +389,7 @@ $parameters=array('arrayfields'=>$arrayfields);
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print ' ';
+print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -414,7 +414,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
print ''."\n";
@@ -473,7 +473,7 @@ while ($i < min($num, $limit))
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 04368ddfc13..100a85f6c30 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -261,14 +261,14 @@ print ' ';
print '';
print $langs->trans("BankAccount").' ';
-print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
print ' ';
print $langs->trans("BankAccountForBankTransfer").' ';
- print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+ $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
print ' ';
-
+
if (!empty($stripeacc)) $connect=$stripeacc.'/';
-
+
// Ref
$url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
if ($servicestatus)
@@ -169,7 +169,7 @@ if (!$rowid)
$url='https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
}
print ''.img_picto($langs->trans('ShowInStripe'), 'object_globe').' '.$charge->customer.' ';
-
+
print "\n";
// Link
print "";
@@ -199,7 +199,7 @@ if (!$rowid)
} else print $FULLTAG;
print " \n";
// Date payment
- print ''.dol_print_date($charge->created, '%d/%m/%Y %H:%M')." \n";
+ print ''.dol_print_date($charge->created, '%d/%m/%Y %H:%M')." \n";
// Type
print '';
if ($charge->source->object=='card')
@@ -213,9 +213,9 @@ if (!$rowid)
}
print ' ';
// Amount
- print "".price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))." ";
+ print ''.price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))." ";
// Status
- print '';
+ print ' ';
if ($charge->refunded=='1'){
print img_picto($langs->trans("refunded"), 'statut6');
} elseif ($charge->paid=='1'){
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 408d47a407c..598cb19dd62 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -95,7 +95,7 @@ class ActionsStripeconnect
$this->resprints.= ' ';
$this->resprints.= '';
$this->resprints.= $langs->trans('StripeCustomer');
- $this->resprints.= ' ';
+ $this->resprints.= ' ';
// $this->resprints.= ''.img_edit().' ';
$this->resprints.= '
';
$this->resprints.= ' ';
@@ -114,7 +114,7 @@ class ActionsStripeconnect
$this->resprints.= '';
$this->resprints.= '';
$this->resprints.= $langs->trans('StripeCustomer');
- $this->resprints.= ' ';
+ $this->resprints.= ' ';
$this->resprints.= '
';
$this->resprints.= ' ';
$this->resprints.= '';
@@ -132,7 +132,7 @@ class ActionsStripeconnect
$this->resprints.= ' ';
$this->resprints.= '';
$this->resprints.= $langs->trans('SubscriptionStripe');
- $this->resprints.= ' ';
+ $this->resprints.= ' ';
$this->resprints.= '
';
$this->resprints.= ' ';
$this->resprints.= '';
@@ -151,7 +151,7 @@ class ActionsStripeconnect
$this->resprints.= ' ';
$this->resprints.= '';
$this->resprints.= $langs->trans('PlanStripe');
- $this->resprints.= ' ';
+ $this->resprints.= ' ';
// $this->resprints.= ''.img_edit().' ';
$this->resprints.= '
';
$this->resprints.= ' ';
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 8cc5b0218b1..fa881a834ea 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -243,13 +243,13 @@ class Stripe extends CommonObject
/**
* Get the Stripe payment intent
*
- * @param Societe $object Object tp pay on Stripe
- * @param string $customer Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
- * @param string $key ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
- * @param int $status Status (0=test, 1=live)
- * @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email fpr receipt
- * @param int $mode automatic=automatic payment, manual=need confirmation
- * @return \Stripe\PaymentIntent|null Stripe PaymentIntent or null if not found
+ * @param Societe $object Object to pay with Stripe
+ * @param string $customer Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
+ * @param string $key ''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+ * @param int $status Status (0=test, 1=live)
+ * @param int $usethirdpartyemailforreceiptemail 1=use thirdparty email for receipt
+ * @param int $mode automatic=automatic payment, manual=need confirmation
+ * @return \Stripe\PaymentIntent|null Stripe PaymentIntent or null if not found
*/
public function getPaymentIntent($object, $customer, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic')
{
@@ -284,7 +284,7 @@ class Stripe extends CommonObject
$obj = $this->db->fetch_object($resql);
$intent = $obj->ext_payment_id;
- dol_syslog(get_class($this) . "::customerStripe found stripe customer key_account = ".$tiers);
+ dol_syslog(get_class($this) . "::customerStripe found record");
// Force to use the correct API key
global $stripearrayofkeysbyenv;
@@ -308,8 +308,11 @@ class Stripe extends CommonObject
if (! in_array($object->multicurrency_code, $arrayzerounitcurrency)) $stripeamount=$object->multicurrency_total_ttc * 100;
else $stripeamount = $object->multicurrency_total_ttc;
- $fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
- if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
+ $fee = round(($object->total_ttc * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
+ if ($fee >= ($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL * 100) && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL>$conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
+ $fee = round($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL * 100);
+ }
+ elseif ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
}
@@ -328,9 +331,9 @@ class Stripe extends CommonObject
{
$dataforintent["application_fee"] = $fee;
}
- if ($societe->email && $usethirdpartyemailforreceiptemail)
+ if ($usethirdpartyemailforreceiptemail && $object->thirdparty->email)
{
- $dataforintent["receipt_email"] = $societe->email;
+ $dataforintent["receipt_email"] = $object->thirdparty->email;
}
try {
@@ -584,9 +587,11 @@ class Stripe extends CommonObject
$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref"));
}
} else {
-
- $fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
- if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
+ $fee = round(($object->total_ttc * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
+ if ($fee >= ($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL * 100) && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL>$conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
+ $fee = round($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL * 100);
+ }
+ elseif ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
}
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index bf8802f4c89..cf2fa221e85 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -8,7 +8,7 @@
* Copyright (C) 2014 Raphaël Doursenaud
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
* Copyright (C) 2015 Juanjo Menent
- * Copyright (C) 2018 Thibault FOUCART
+ * Copyright (C) 2018-2019 Thibault FOUCART
* Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -80,22 +80,29 @@ if ($facid > 0)
if (! empty($conf->stripe->enabled))
{
- $service = 'StripeTest';
- $servicestatus = 0;
- if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
- {
- $service = 'StripeLive';
- $servicestatus = 0;
- }
-
- $stripe=new Stripe($db);
- $stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here)
+ access_forbidden();
}
+if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
+{
+ $service = 'StripeTest';
+ $servicestatus = '0';
+ dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+}
+else
+{
+ $service = 'StripeLive';
+ $servicestatus = '1';
+}
+$stripeacc = $stripe->getStripeAccount($service);
+/*if (empty($stripeaccount))
+{
+ print $langs->trans('ErrorStripeAccountNotDefined');
+}*/
+
// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('paiementcard','globalcard'));
-
/*
* Actions
*/
@@ -223,9 +230,9 @@ if (empty($reshook))
$action = 'create';
if (!$source) {
setEventMessages($langs->transnoentities('NoSource'), null, 'errors');
- }
- $error++;
- }
+ }
+ $error++;
+ }
// Le reste propre a cette action s'affiche en bas de page.
}
@@ -626,7 +633,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
foreach ($customerstripe->sources->data as $src) {
print '';
- print 'id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
print'class="opacitymedium"';
}
@@ -690,7 +697,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print ' ';
// Default
- print 'id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
print'class="opacitymedium"';
}
@@ -709,7 +716,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (($account->type=='custom' or $account->type=='express') && $entity==1) {
print ' ';
- print 'getStripeCustomerAccount($facture->socid)!=$source) {
print'class="opacitymedium"';
}
@@ -738,7 +745,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ' ';
// Default
- print 'id!=$source) {
print'class="opacitymedium"';
}
@@ -816,21 +823,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '';
print '';
print ''.$arraytitle.' ';
- print ''.$langs->trans('Date').' ';
+ print ''.$langs->trans('Date').' ';
if (!empty($conf->multicurrency->enabled)) {
print ''.$langs->trans('Currency').' ';
- print ''.$langs->trans('MulticurrencyAmountTTC').' ';
- print ''.$multicurrencyalreadypayedlabel.' ';
- print ''.$multicurrencyremaindertopay.' ';
+ print ''.$langs->trans('MulticurrencyAmountTTC').' ';
+ print ''.$multicurrencyalreadypayedlabel.' ';
+ print ''.$multicurrencyremaindertopay.' ';
}
- print ''.$langs->trans('AmountTTC').' ';
- print ''.$alreadypayedlabel.' ';
- print ''.$remaindertopay.' ';
- print ''.$langs->trans('PaymentAmount').' ';
+ print ''.$langs->trans('AmountTTC').' ';
+ print ''.$alreadypayedlabel.' ';
+ print ''.$remaindertopay.' ';
+ print ''.$langs->trans('PaymentAmount').' ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.$langs->trans('MulticurrencyPaymentAmount').' ';
+ print ''.$langs->trans('MulticurrencyPaymentAmount').' ';
}
- print ' ';
+ print ' ';
print " \n";
$total=0;
@@ -871,20 +878,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print "\n";
// Date
- print ''.dol_print_date($db->jdate($objp->df), 'day')." \n";
+ print ''.dol_print_date($db->jdate($objp->df), 'day')." \n";
// Currency
- if (!empty($conf->multicurrency->enabled)) print ''.$objp->multicurrency_code." \n";
+ if (!empty($conf->multicurrency->enabled)) print ''.$objp->multicurrency_code." \n";
// Multicurrency Price
if (!empty($conf->multicurrency->enabled))
{
- print '';
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
print ' ';
// Multicurrency Price
- print '';
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
print price($sign * $multicurrency_payment);
@@ -894,26 +901,26 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ' ';
// Multicurrency Price
- print '';
+ print ' ';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
print ' ';
}
// Price
- print ''.price($sign * $objp->total_ttc).' ';
+ print ''.price($sign * $objp->total_ttc).' ';
// Received or paid back
- print ''.price($sign * $paiement);
+ print ' '.price($sign * $paiement);
if ($creditnotes) print '+'.price($creditnotes);
if ($deposits) print '+'.price($deposits);
print ' ';
// Remain to take or to pay back
- print ''.price($sign * $remaintopay).' ';
+ print ''.price($sign * $remaintopay).' ';
//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
// Amount
- print '';
+ print ' ';
// Add remind amount
$namef = 'amount_'.$objp->facid;
@@ -936,7 +943,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Multicurrency Price
if (! empty($conf->multicurrency->enabled))
{
- print ' ';
+ print ' ';
// Add remind multicurrency amount
$namef = 'multicurrency_amount_'.$objp->facid;
@@ -961,7 +968,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
// Warning
- print ' ';
+ print ' ';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]." ';
print ''.$langs->trans('TotalTTC').' ';
- if (!empty($conf->multicurrency->enabled)) {
+ if (!empty($conf->multicurrency->enabled)) {
print ''.price($sign * $total_ttc).' '.price($sign * $totalrecu);
+ print ' '.price($sign * $total_ttc).' '.price($sign * $totalrecu);
if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
if ($totalrecudeposits) print '+'.price($totalrecudeposits);
print ' '.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).' \n";
@@ -1011,7 +1018,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$db->free($resql);
}
else
- {
+ {
dol_print_error($db);
}
@@ -1044,9 +1051,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (!empty($totalpayment)) {
$text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
}
- if (!empty($multicurrency_totalpayment)) {
- $text.=''.$objp->ref." '.dol_print_date($db->jdate($objp->dp))." \n";
print ''.$objp->paiement_type.' '.$objp->num_paiement." \n";
- print ''.price($objp->amount).' ';
+ print ''.price($objp->amount).' ';
$parameters=array();
$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 2fec924c2bf..0149775c360 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -103,12 +103,12 @@ if (! $rowid) {
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
- print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
+ print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
print "\n";
print "\n";
@@ -198,16 +198,16 @@ if (! $rowid) {
//}
//print "\n";
// Date payment
- print '' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . " \n";
+ print '' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . " \n";
// Date payment
- print '' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . " \n";
+ print '' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . " \n";
// Type
print '' . $payout->description . ' ';
// Amount
- print "" . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . " ";
- print "" . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . " ";
+ print '' . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . " ";
+ print '' . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . " ";
// Status
- print "";
+ print " ";
if ($payout->status=='paid') {
print img_picto($langs->trans("".$payout->status.""), 'statut4');
} elseif ($payout->status=='pending') {
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 467d242a0c8..d1ab2ebe50d 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2018-2019 Thibault FOUCART
* Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,6 @@ else
$service = 'StripeLive';
$servicestatus = '1';
}
-
$stripeacc = $stripe->getStripeAccount($service);
/*if (empty($stripeaccount))
{
@@ -103,11 +102,11 @@ if (! $rowid) {
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
- print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
- print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
+ print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right_');
print "\n";
print "\n";
@@ -162,7 +161,7 @@ if (! $rowid) {
// Ref
if (!empty($stripeacc)) $connect=$stripeacc.'/';
-
+
// Ref
if (preg_match('/po_/i', $txn->source)){
$origin="payouts";
@@ -208,20 +207,21 @@ if (! $rowid) {
//}
//print " \n";
// Date payment
- print '' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . " \n";
+ print '' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . " \n";
// Type
print '' . $txn->type . ' ';
// Amount
- print "" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . " ";
- print "" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . " ";
+ print '' . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . " ";
+ print '' . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . " ";
// Status
- print "";
- if ($txn->status=='available')
- {print img_picto($langs->trans("".$txn->status.""), 'statut4');}
- elseif ($txn->status=='pending')
- {print img_picto($langs->trans("".$txn->status.""), 'statut7');}
- elseif ($txn->status=='failed')
- {print img_picto($langs->trans("".$txn->status.""), 'statut8');}
+ print " ";
+ if ($txn->status=='available') {
+ print img_picto($langs->trans("".$txn->status.""), 'statut4');
+ } elseif ($txn->status=='pending') {
+ print img_picto($langs->trans("".$txn->status.""), 'statut7');
+ } elseif ($txn->status=='failed') {
+ print img_picto($langs->trans("".$txn->status.""), 'statut8');
+ }
print ' ';
print "\n";
}
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 3a0f1eed273..1b5c08119d1 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -76,13 +76,13 @@ $extrafields->fetch_name_optionals_label($elementtype);
print "";
print '';
-print ''.$langs->trans("Position").' ';
+print ''.$langs->trans("Position").' ';
print ''.$langs->trans("Label").' ';
print ''.$langs->trans("AttributeCode").' ';
print ''.$langs->trans("Type").' ';
-print ''.$langs->trans("Size").' ';
-print ''.$langs->trans("Unique").' ';
-print ''.$langs->trans("Required").' ';
+print ''.$langs->trans("Size").' ';
+print ''.$langs->trans("Unique").' ';
+print ''.$langs->trans("Required").' ';
print ' ';
print " \n";
@@ -93,10 +93,10 @@ foreach($extrafields->attribute_type as $key => $value)
print "".$extrafields->attribute_label[$key]." \n";
print "".$key." \n";
print "".$type2label[$extrafields->attribute_type[$key]]." \n";
- print ''.$extrafields->attribute_size[$key]." \n";
- print ''.yn($extrafields->attribute_unique[$key])." \n";
- print ''.yn($extrafields->attribute_required[$key])." \n";
- print ''.img_edit().' ';
+ print ''.$extrafields->attribute_size[$key]." \n";
+ print ''.yn($extrafields->attribute_unique[$key])." \n";
+ print ''.yn($extrafields->attribute_required[$key])." \n";
+ print ''.img_edit().' ';
print " ".img_delete()." ';
print ''.$langs->trans("Label").' ';
print ''.$langs->trans("AttributeCode").' ';
print ''.$langs->trans("Type").' ';
-print ''.$langs->trans("Size").' ';
-print ''.$langs->trans("Unique").' ';
-print ''.$langs->trans("Required").' ';
+print ''.$langs->trans("Size").' ';
+print ''.$langs->trans("Unique").' ';
+print ''.$langs->trans("Required").' ';
print ' ';
print " \n";
@@ -96,10 +96,10 @@ foreach($extrafields->attribute_type as $key => $value)
print "".$extrafields->attribute_label[$key]." \n";
print "".$key." \n";
print "".$type2label[$extrafields->attribute_type[$key]]." \n";
- print ''.$extrafields->attribute_size[$key]." \n";
- print ''.yn($extrafields->attribute_unique[$key])." \n";
- print ''.yn($extrafields->attribute_required[$key])." \n";
- print ''.img_edit().' ';
+ print ''.$extrafields->attribute_size[$key]." \n";
+ print ''.yn($extrafields->attribute_unique[$key])." \n";
+ print ''.yn($extrafields->attribute_required[$key])." \n";
+ print ''.img_edit().' ';
print " ".img_delete()." ';
print $form->select_company('', 'socid', 's.fournisseur = 1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").' ';
print ' ';
}
print '' . "\n";
@@ -1165,7 +1165,7 @@ if ($action == 'create')
print '' . $langs->trans("Project") . ' ';
$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
- print ' id).'">' . $langs->trans("AddProject") . ' ';
+ print ' id).'">' . $langs->trans("AddProject") . ' ';
print ' ';
print '';
@@ -1468,7 +1468,7 @@ if ($action == 'create')
print $langs->trans('PaymentConditionsShort');
print '';
if ($action != 'editconditions' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '
';
print '';
if ($action == 'editconditions') {
@@ -1486,7 +1486,7 @@ if ($action == 'create')
print $langs->trans('DeliveryDate');
print ' ';
if ($action != 'editdate_livraison' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . '
';
print ' ';
if ($action == 'editdate_livraison') {
@@ -1509,7 +1509,7 @@ if ($action == 'create')
print $langs->trans('PaymentMode');
print ' ';
if ($action != 'editmode' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . '
';
print '
';
if ($action == 'editmode') {
@@ -1529,7 +1529,7 @@ if ($action == 'create')
print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '
';
print '
';
if ($action == 'editmulticurrencycode') {
@@ -1546,7 +1546,7 @@ if ($action == 'create')
print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
print ' ';
if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
- print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ' id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '
';
print '';
if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -1571,7 +1571,7 @@ if ($action == 'create')
// Outstanding Bill
print ' ';
print $langs->trans('OutstandingBill');
- print ' ';
+ print ' ';
print price($soc->get_OutstandingBill()) . ' / ';
print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
print ' ';
@@ -1586,7 +1586,7 @@ if ($action == 'create')
print $langs->trans('BankAccount');
print '';
if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer)
- print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'
';
print ' ';
if ($action == 'editbankaccount') {
@@ -1739,7 +1739,7 @@ if ($action == 'create')
if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= ''.$langs->trans('SupplierProposalRefFournNotice').'
'; // TODO Suggest a permanent checkbox instead of option
$form_close .= ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -272,7 +272,7 @@ if ($resql)
print ' '.$companystatic->getNomUrl(1, 'customer').' ';
print ''.dol_print_date($db->jdate($obj->datec), 'day').' ';
- print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).' ';
+ print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).' ';
print '';
if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
- print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->supplier_proposalid;
@@ -348,10 +348,10 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$companystatic->canvas=$obj->canvas;
print ' '.$companystatic->getNomUrl(1, 'customer', 44).' '."\n";
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp), 'day').' '."\n";
- print ''.price($obj->total_ttc).' ';
- print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).' '."\n";
+ print ''.price($obj->total_ttc).' ';
+ print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).' '."\n";
print ''."\n";
$i++;
$total += $obj->total_ttc;
@@ -362,7 +362,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
}
elseif ($total>0)
{
- print ''.$langs->trans("Total")." ".price($total)." '.$langs->trans("Total").' '.price($total)."
';
+ print ' ';
print ' ';
}
@@ -492,21 +492,21 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '';
+ print ' ';
print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
print ' ';
}
// Company type
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
print ' ';
}
// Date
if (! empty($arrayfields['sp.date_valid']['checked']))
{
- print '';
+ print ' ';
//print $langs->trans('Month').': ';
print ' ';
+ print ' ';
//print $langs->trans('Month').': ';
print ' ';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['sp.total_vat']['checked']))
{
// Amount
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['sp.total_ttc']['checked']))
{
// Amount
- print '';
+ print ' ';
print ' ';
}
if (! empty($arrayfields['u.login']['checked']))
{
// Author
- print '';
+ print ' ';
print ' ';
}
@@ -575,12 +575,12 @@ if ($resql)
// Status
if (! empty($arrayfields['sp.fk_statut']['checked']))
{
- print '';
+ print ' ';
$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status');
print ' ';
}
// Action column
- print '';
+ print ' ';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' ';
@@ -594,24 +594,24 @@ if ($resql)
if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, 'align="center"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+ if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');
+ if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print '';
+ print ' ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -707,7 +707,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print ' ';
+ print ' ';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print ' ';
@@ -716,7 +716,7 @@ if ($resql)
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
- print '';
+ print ' ';
if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print ' ';
@@ -726,7 +726,7 @@ if ($resql)
// Date proposal
if (! empty($arrayfields['sp.date_valid']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_valid), 'day');
print " \n";
if (! $i) $totalarray['nbfield']++;
@@ -735,7 +735,7 @@ if ($resql)
// Date delivery
if (! empty($arrayfields['sp.date_livraison']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp), 'day');
print " \n";
if (! $i) $totalarray['nbfield']++;
@@ -744,7 +744,7 @@ if ($resql)
// Amount HT
if (! empty($arrayfields['sp.total_ht']['checked']))
{
- print ''.price($obj->total_ht)." \n";
+ print ''.price($obj->total_ht)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
@@ -752,7 +752,7 @@ if ($resql)
// Amount VAT
if (! empty($arrayfields['sp.total_vat']['checked']))
{
- print ''.price($obj->total_vat)." \n";
+ print ''.price($obj->total_vat)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_vat;
@@ -760,7 +760,7 @@ if ($resql)
// Amount TTC
if (! empty($arrayfields['sp.total_ttc']['checked']))
{
- print ''.price($obj->total_ttc)." \n";
+ print ''.price($obj->total_ttc)." \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
@@ -772,7 +772,7 @@ if ($resql)
// Author
if (! empty($arrayfields['u.login']['checked']))
{
- print '';
+ print ' ';
if ($userstatic->id) print $userstatic->getLoginUrl(1);
else print ' ';
print " \n";
@@ -788,7 +788,7 @@ if ($resql)
// Date creation
if (! empty($arrayfields['sp.datec']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -796,7 +796,7 @@ if ($resql)
// Date modification
if (! empty($arrayfields['sp.tms']['checked']))
{
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print ' ';
if (! $i) $totalarray['nbfield']++;
@@ -804,12 +804,12 @@ if ($resql)
// Status
if (! empty($arrayfields['sp.fk_statut']['checked']))
{
- print ''.$objectstatic->LibStatut($obj->fk_statut, 5)." \n";
+ print ''.$objectstatic->LibStatut($obj->fk_statut, 5)." \n";
if (! $i) $totalarray['nbfield']++;
}
// Action column
- print '';
+ print ' ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
@@ -845,9 +845,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
else print ''.$langs->trans("Totalforthispage").' ';
}
- elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
- elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
- elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
+ elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
+ elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
+ elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' ';
else print 'trans("SupplierProposal"); ?>
trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?> datec, 'day'); ?>
- datec, 'day'); ?>
+ rights->supplier_proposal->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?>
- getLibStatut(3); ?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> getLibStatut(3); ?>
+ ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
trans("Total"); ?>
$val)
//Printer1
print '';
-print ''.$langs->trans("Printer").' 1 ';
+print ' '.$langs->trans("Printer").' 1 ';
print ' ';
-print ''.$langs->trans("Printer").' 2 ';
+print ' '.$langs->trans("Printer").' 2 ';
print '