| '.$langs->trans("ECMCreationDate").' | ';
+$s = img_picto('','object_dir').' '.$langs->trans("ECMRoot").' -> '.$s.' -> ';
+if ($action == 'edit') $s .= '';
+else $s .= $urlfile;
+
+$object->ref=''; // Force to hide ref
+dol_banner_tab($object, '', $morehtml, 0, '', '', $s);
+
+print '';
+
+print ' ';
+print ' ';
+print '| '.$langs->trans("ECMCreationDate").' | ';
print dol_print_date(dol_filemtime($fullpath),'dayhour');
print ' | ';
/*print '| '.$langs->trans("ECMDirectoryForFiles").' | ';
@@ -385,6 +374,7 @@ else
print ' | ';
print ' ';
+print '
- ';
-// End top panel, toolbar
-
-?>
-
-formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
-}
-// End confirm
-
-
-if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
-{
- print ' '."\n";
-
- print ''."\n";
- print ''."\n";
- print '| ';
- print ' '.$langs->trans("ECMSections");
- print ' | ';
-
- $showonrightsize='';
-
- // Manual section
- $htmltooltip=$langs->trans("ECMAreaDesc2");
-
- if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
- {
- print '| ';
-
- // Show filemanager tree (will be filled by call of ajax enablefiletreeajax.tpl.php that execute ajaxdirtree.php)
- print '';
-
- if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
-
- print ' | ';
- }
- else
- {
- print '| ';
-
- if (empty($module)) $module='ecm';
-
- $_POST['modulepart'] = $module;
- $_POST['openeddir'] = GETPOST('openeddir');
- $_POST['dir'] = empty($_POST['dir'])?'/':$_POST['dir'];
-
- // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
- print ' ';
-
- $mode='noajax';
- $url=DOL_URL_ROOT.'/ecm/index.php';
- include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
-
- print ' ';
- print ' | ';
- }
-
-
- print " ";
-}
-
-
-// End left panel
-?>
- ';
// Toolbar
-if ($user->rights->ecm->setup)
-{
- print ' ';
- print ' ';
- print '';
-}
-else
-{
- print ' ';
- print '';
- print '';
-}
-if ($module == 'ecm')
-{
- $url=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&module='.$module:'').($section?'§ion='.$section:'')));
- print ' ';
- print ' ';
- print '';
-}
+//if (preg_match('/\/ecm/', $_SERVER['PHP_SELF'])) {
+//if ($module == 'ecm') {
+
+ if ($permtoadd)
+ {
+ print ' ';
+ print '';
+ print '';
+ }
+ else
+ {
+ print ' ';
+ print '';
+ print '';
+ }
+ if ($module == 'ecm')
+ {
+ $tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&module='.$module:'').($section?'§ion='.$section:'')));
+ print ' ';
+ print '';
+ print '';
+ }
+//}
// Start "Add new file" area
$nameforformuserfile = 'formuserfileecm';
@@ -84,7 +105,7 @@ if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABL
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
$formfile=new FormFile($db);
- $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $user->rights->ecm->upload, 48, null, '', 0, '', 0, $nameforformuserfile);
+ $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile);
}
else print ' ';
@@ -140,8 +161,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
{
print ' | ';
- if (empty($module)) $module='ecm';
-
$_POST['modulepart'] = $module;
$_POST['openeddir'] = GETPOST('openeddir');
$_POST['dir'] = empty($_POST['dir'])?'/':$_POST['dir'];
@@ -150,7 +169,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print ' ';
$mode='noajax';
- $url=DOL_URL_ROOT.'/ecm/index.php';
+ if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
print ' ';
@@ -173,7 +192,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$mode='noajax';
-$url=DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 6cada0b16a9..5c7bf296485 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -233,12 +233,12 @@ foreach ($search_array_options as $key => $val)
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
$typ=$extrafields->attribute_type[$tmpkey];
- $mode=0;
- if (in_array($typ, array('int','double','real'))) $mode=1; // Search on a numeric
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2; // Search on a foreign key int
- if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+ $mode_search=0;
+ if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
+ if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
+ if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
{
- $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+ $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
}
}
// Add where from hooks
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 29a058f2d33..dc2c0a22f66 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -234,8 +234,12 @@ if (empty($reshook))
$db->begin();
$id = $object->create($user);
+ if ($id <= 0)
+ {
+ $error++;
+ }
- if ($id > 0)
+ if (! $error)
{
$db->commit();
Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 437114ab7df..b2d6f052a2a 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -215,7 +215,8 @@ class ExpenseReport extends CommonObject
$resql=$this->db->query($sql);
if (!$resql) $error++;
- if (is_array($this->lines) && count($this->lines)>0) {
+ if (is_array($this->lines) && count($this->lines)>0)
+ {
foreach ($this->lines as $i => $val)
{
$newndfline=new ExpenseReportLine($this->db);
@@ -233,6 +234,12 @@ class ExpenseReport extends CommonObject
}
}
+ if (! $error)
+ {
+ $result=$this->insertExtraFields();
+ if ($result < 0) $error++;
+ }
+
if (! $error)
{
$result=$this->update_price();
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 30d5eea98d6..a9f1e0ecde4 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -324,13 +324,13 @@ foreach ($search_array_options as $key => $val)
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
$typ=$extrafields->attribute_type[$tmpkey];
- $mode=0;
- if (in_array($typ, array('int','double','real'))) $mode=1; // Search on a numeric
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2; // Search on a foreign key int
- if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
- {
- $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
- }
+ $mode_search=0;
+ if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
+ if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
+ if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+ {
+ $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+ }
}
// Add where from hooks
$parameters=array();
@@ -380,7 +380,7 @@ if ($resql)
'builddoc'=>$langs->trans("PDFMerge"),
);
if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
- if ($massaction == 'presend') $arrayofmassactions=array();
+ if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
// Lines of title fields
@@ -486,15 +486,11 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
}
- if ($massaction == 'presend')
- {
- $topicmail="SendExpenseReport";
- $modelmail="expensereport";
- $objecttmp=new ExpenseReport($db);
- $trackid='int'.$object->id;
-
- include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
- }
+ $topicmail="SendExpenseReport";
+ $modelmail="expensereport";
+ $objecttmp=new ExpenseReport($db);
+ $trackid='int'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall)
{
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 3b4aca20951..baf90355249 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -222,12 +222,12 @@ foreach ($search_array_options as $key => $val)
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
$typ=$extrafields->attribute_type[$tmpkey];
- $mode=0;
- if (in_array($typ, array('int','double','real'))) $mode=1; // Search on a numeric
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2; // Search on a foreign key int
- if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+ $mode_search=0;
+ if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
+ if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
+ if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
{
- $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+ $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
}
}
// Add where from hooks
@@ -285,9 +285,8 @@ if ($resql)
//'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- //if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
if ($user->rights->ficheinter->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
- //if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+ //if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
// Lines of title fields
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7f002bc40c0..437732b71d0 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1392,7 +1392,7 @@ class CommandeFournisseur extends CommonOrder
* @param float $txlocaltax2 Localtax2 tax
* @param int $fk_product Id product
* @param int $fk_prod_fourn_price Id supplier price
- * @param string $fourn_ref Supplier reference price
+ * @param string $ref_supplier Supplier reference price
* @param float $remise_percent Remise
* @param string $price_base_type HT or TTC
* @param float $pu_ttc Unit price TTC
@@ -1408,13 +1408,13 @@ class CommandeFournisseur extends CommonOrder
* @param int $origin_id Id of origin object
* @return int <=0 if KO, >0 if OK
*/
- public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit=null, $pu_ht_devise=0, $origin='', $origin_id=0)
+ public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $ref_supplier='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit=null, $pu_ht_devise=0, $origin='', $origin_id=0)
{
global $langs,$mysoc,$conf;
$error = 0;
- dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit");
+ dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
// Clean parameters
@@ -1441,7 +1441,6 @@ class CommandeFournisseur extends CommonOrder
$pu=$pu_ttc;
}
$desc=trim($desc);
- $ref_supplier=''; // Ref of supplier price when we add line
// Check parameters
if ($qty < 1 && ! $fk_product)
@@ -1460,16 +1459,16 @@ class CommandeFournisseur extends CommonOrder
if (empty($conf->global->SUPPLIER_ORDER_WITH_NOPRICEDEFINED))
{
// Check quantity is enough
- dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." fourn_ref=".$fourn_ref);
+ dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
$prod = new Product($this->db, $fk_product);
if ($prod->fetch($fk_product) > 0)
{
$product_type = $prod->type;
$label = $prod->label;
- // We use 'none' instead of $fourn_ref, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+ // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
- $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$fourn_ref/$this->fk_soc
+ $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
if ($result > 0)
{
$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
@@ -2335,8 +2334,8 @@ class CommandeFournisseur extends CommonOrder
* @param string $desc Description de la ligne
* @param double $pu Prix unitaire
* @param double $qty Quantity
- * @param double $remise_percent Pourcentage de remise de la ligne
- * @param double $txtva Taux TVA
+ * @param double $remise_percent Percent discount on line
+ * @param double $txtva VAT rate
* @param double $txlocaltax1 Localtax1 tax
* @param double $txlocaltax2 Localtax2 tax
* @param double $price_base_type Type of price base
@@ -2348,9 +2347,10 @@ class CommandeFournisseur extends CommonOrder
* @param array $array_options Extrafields array
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Unit price in currency
+ * @param string $ref_supplier Supplier ref
* @return int < 0 if error, > 0 if ok
*/
- public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0)
+ public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise=0, $ref_supplier='')
{
global $mysoc, $conf;
dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
@@ -2430,6 +2430,7 @@ class CommandeFournisseur extends CommonOrder
//$this->line->label=$label;
$this->line->desc=$desc;
$this->line->qty=$qty;
+ $this->line->ref_supplier=$ref_supplier;
$this->line->vat_src_code = $vat_src_code;
$this->line->tva_tx = $txtva;
@@ -3277,6 +3278,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
// Mise a jour ligne en base
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
$sql.= " description='".$this->db->escape($this->desc)."'";
+ $sql.= ", ref='".$this->db->escape($this->ref_supplier)."'";
$sql.= ", subprice='".price2num($this->subprice)."'";
//$sql.= ",remise='".price2num($remise)."'";
$sql.= ", remise_percent='".price2num($this->remise_percent)."'";
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 15bd4366a29..249fda336f1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1372,11 +1372,12 @@ class FactureFournisseur extends CommonInvoice
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param int $origin_id id origin document
* @param double $pu_ht_devise Amount in currency
+ * @param string $ref_supplier Supplier ref
* @return int >0 if OK, <0 if KO
*
* FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order.
*/
- public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0)
+ public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null, $origin_id=0, $pu_ht_devise=0, $ref_supplier='')
{
dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1435,6 +1436,7 @@ class FactureFournisseur extends CommonInvoice
//$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->vat_src_code=$vat_src_code;
$this->line->tva_tx=$txtva;
@@ -2615,7 +2617,8 @@ class SupplierInvoiceLine extends CommonObjectLine
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
- $sql.= " description ='".$this->db->escape($this->description)."'";
+ $sql.= " description ='".$this->db->escape($this->description)."'";
+ $sql.= ", ref ='".$this->db->escape($this->ref)."'";
$sql.= ", pu_ht = ".price2num($this->pu_ht);
$sql.= ", pu_ttc = ".price2num($this->pu_ttc);
$sql.= ", qty = ".price2num($this->qty);
@@ -2743,7 +2746,7 @@ class SupplierInvoiceLine extends CommonObjectLine
// Insertion dans base de la ligne
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= ' (fk_facture_fourn, fk_parent_line, label, description, qty,';
+ $sql.= ' (fk_facture_fourn, fk_parent_line, label, description, ref, qty,';
$sql.= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
$sql.= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
$sql.= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
@@ -2754,6 +2757,7 @@ class SupplierInvoiceLine extends CommonObjectLine
$sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
$sql.= " '".$this->db->escape($this->desc)."',";
+ $sql.= " '".$this->db->escape($this->ref_supplier)."',";
$sql.= " ".price2num($this->qty).",";
$sql.= " ".(empty($this->vat_src_code)?"''":"'".$this->db->escape($this->vat_src_code)."'").",";
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 504147adff3..1c6363644f9 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -432,7 +432,7 @@ class ProductFournisseur extends Product
if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
{
$priceparser = new PriceParser($this->db);
- $price_result = $priceparser->parseProductSupplier($this->fk_product, $this->fk_supplier_price_expression, $this->fourn_qty, $this->fourn_tva_tx);
+ $price_result = $priceparser->parseProductSupplier($this);
if ($price_result >= 0) {
$this->fourn_price = $price_result;
//recalculation of unitprice, as probably the price changed...
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6b4f1417100..c96c42e2297 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -446,6 +446,7 @@ if (empty($reshook))
$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
$desc = $product_desc;
$type = GETPOST('type');
+ $ref_supplier = GETPOST('fourn_ref','alpha');
$fk_unit= GETPOST('units', 'alpha');
@@ -470,7 +471,7 @@ if (empty($reshook))
$pu_ht_devise = price2num($price_ht_devise, 'MU');
- $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
+ $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
}
//print "xx".$tva_tx; exit;
@@ -507,6 +508,7 @@ if (empty($reshook))
unset($_POST['price_ht']);
unset($_POST['multicurrency_price_ht']);
unset($_POST['price_ttc']);
+ unset($_POST['fourn_ref']);
unset($_POST['tva_tx']);
unset($_POST['label']);
unset($localtax1_tx);
@@ -547,23 +549,23 @@ if (empty($reshook))
if ($lineid)
{
- $line = new CommandeFournisseurLigne($db);
- $res = $line->fetch($lineid);
- if (!$res) dol_print_error($db);
+ $line = new CommandeFournisseurLigne($db);
+ $res = $line->fetch($lineid);
+ if (!$res) dol_print_error($db);
}
$productsupplier = new ProductFournisseur($db);
- if ($productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
+ if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
{
setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
}
- $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
- $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+ $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+ $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
- // Define info_bits
- $info_bits = 0;
- if (preg_match('/\*/', $vat_rate))
+ // Define info_bits
+ $info_bits = 0;
+ if (preg_match('/\*/', $vat_rate))
$info_bits |= 0x01;
// Define vat_rate
@@ -604,23 +606,24 @@ if (empty($reshook))
}
$result = $object->updateline(
- $lineid,
- $_POST['product_desc'],
- $ht,
- $_POST['qty'],
- $_POST['remise_percent'],
- $vat_rate,
- $localtax1_rate,
- $localtax2_rate,
- $price_base_type,
- 0,
- isset($_POST["type"])?$_POST["type"]:$line->product_type,
- false,
- $date_start,
- $date_end,
- $array_options,
+ $lineid,
+ $_POST['product_desc'],
+ $ht,
+ $_POST['qty'],
+ $_POST['remise_percent'],
+ $vat_rate,
+ $localtax1_rate,
+ $localtax2_rate,
+ $price_base_type,
+ 0,
+ isset($_POST["type"])?$_POST["type"]:$line->product_type,
+ false,
+ $date_start,
+ $date_end,
+ $array_options,
$_POST['units'],
- $pu_ht_devise
+ $pu_ht_devise,
+ GETPOST('fourn_ref','alpha')
);
unset($_POST['qty']);
unset($_POST['type']);
@@ -629,6 +632,7 @@ if (empty($reshook))
unset($_POST['dp_desc']);
unset($_POST['np_desc']);
unset($_POST['pu']);
+ unset($_POST['fourn_ref']);
unset($_POST['tva_tx']);
unset($_POST['date_start']);
unset($_POST['date_end']);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 67b22c6767c..a7c528e11c2 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -426,8 +426,8 @@ if ($id > 0 || ! empty($ref)) {
}
}
- // Auteur
- print ' | | ' . $langs->trans("AuthorRequest") . ' | ';
+ // Author
+ print ' | ' . $langs->trans("AuthorRequest") . ' | ';
print '' . $author->getNomUrl(1, '', 0, 0, 0) . ' | ';
print ' ';
@@ -443,11 +443,13 @@ if ($id > 0 || ! empty($ref)) {
$disabled = 0;
// Line of orders
- if ($object->statut <= 2 || $object->statut >= 6) {
- print $langs->trans("OrderStatusNotReadyToDispatch");
+ if ($object->statut <= CommandeFournisseur::STATUS_ACCEPTED || $object->statut >= CommandeFournisseur::STATUS_CANCELED) {
+ print ' '.$langs->trans("OrderStatusNotReadyToDispatch").'';
}
- if ($object->statut == 3 || $object->statut == 4 || $object->statut == 5) {
+ if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT
+ || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY
+ || $object->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
$entrepot = new Entrepot($db);
$listwarehouses = $entrepot->list_array(1);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5194d6296bb..db947f4011f 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -580,12 +580,12 @@ foreach ($search_array_options as $key => $val)
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
$typ=$extrafields->attribute_type[$tmpkey];
- $mode=0;
- if (in_array($typ, array('int','double','real'))) $mode=1; // Search on a numeric
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2; // Search on a foreign key int
- if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+ $mode_search=0;
+ if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
+ if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
+ if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
{
- $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+ $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
}
}
// Add where from hooks
@@ -661,7 +661,7 @@ if ($resql)
);
//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
- if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+ if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
// Lignes des champs de filtre
@@ -678,15 +678,11 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
- if ($massaction == 'presend')
- {
- $topicmail="SendOrderRef";
- $modelmail="order_supplier_send";
- $objecttmp=new CommandeFournisseur($db);
- $trackid='sord'.$object->id;
-
- include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
- }
+ $topicmail="SendOrderRef";
+ $modelmail="order_supplier_send";
+ $objecttmp=new CommandeFournisseur($db);
+ $trackid='sord'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($massaction == 'createbills')
{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index de05d2f1a6e..59f15ea155b 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -845,7 +845,8 @@ if (empty($reshook))
if ($result >= 0)
{
unset($_POST['label']);
- unset($_POST['date_starthour']);
+ unset($_POST['fourn_ref']);
+ unset($_POST['date_starthour']);
unset($_POST['date_startmin']);
unset($_POST['date_startsec']);
unset($_POST['date_startday']);
@@ -998,7 +999,6 @@ if (empty($reshook))
$type = $productsupplier->type;
$price_base_type = 'HT';
- // TODO Save the product supplier ref into database (like done for supplier propal and order) into field ref_supplier (must rename field ref into ref_supplier first)
$result=$object->addline(
$desc,
$productsupplier->fourn_pu,
@@ -1017,7 +1017,8 @@ if (empty($reshook))
-1,
0,
$array_options,
- $productsupplier->fk_unit
+ $productsupplier->fk_unit,
+ $productsupplier->fourn_ref
);
}
if ($idprod == -99 || $idprod == 0)
@@ -1042,6 +1043,7 @@ if (empty($reshook))
$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
$desc = $product_desc;
$type = GETPOST('type');
+ $ref_supplier = GETPOST('fourn_ref','alpha');
$fk_unit= GETPOST('units', 'alpha');
@@ -1063,7 +1065,7 @@ if (empty($reshook))
$price_base_type = 'HT';
$pu_ht_devise = price2num($price_ht_devise, 'MU');
- $result=$object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_ht_devise);
+ $result=$object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_ht_devise, $ref_supplier);
}
//print "xx".$tva_tx; exit;
@@ -1098,6 +1100,7 @@ if (empty($reshook))
unset($_POST['price_ht']);
unset($_POST['multicurrency_price_ht']);
unset($_POST['price_ttc']);
+ unset($_POST['fourn_ref']);
unset($_POST['tva_tx']);
unset($_POST['label']);
unset($localtax1_tx);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 508a9e28117..bdf9349763b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -372,12 +372,12 @@ foreach ($search_array_options as $key => $val)
$crit=$val;
$tmpkey=preg_replace('/search_options_/','',$key);
$typ=$extrafields->attribute_type[$tmpkey];
- $mode=0;
- if (in_array($typ, array('int','double','real'))) $mode=1; // Search on a numeric
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2; // Search on a foreign key int
- if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+ $mode_search=0;
+ if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
+ if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
+ if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
{
- $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+ $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
}
}
// Add where from hooks
@@ -472,7 +472,7 @@ if ($resql)
);
//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
- if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+ if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
$i = 0;
@@ -489,15 +489,11 @@ if ($resql)
print_barre_liste($langs->trans("BillsSuppliers").($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
- if ($massaction == 'presend')
- {
- $topicmail="SendBillRef";
- $modelmail="supplier_invoice_send";
- $objecttmp=new FactureFournisseur($db);
- $trackid='sinv'.$object->id;
-
- include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
- }
+ $topicmail="SendBillRef";
+ $modelmail="supplier_invoice_send";
+ $objecttmp=new FactureFournisseur($db);
+ $trackid='sinv'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($massaction == 'createbills')
{
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index c6a8f24f98f..c5b39a87681 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -119,7 +119,7 @@ $arrayofmassactions = array(
'builddoc'=>$langs->trans("PDFMerge"),
);
if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index efe1c87820e..1d89bbbdd94 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -299,7 +299,7 @@ $arrayofmassactions = array(
//'builddoc'=>$langs->trans("PDFMerge"),
);
if ($user->rights->holiday->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
-//if ($massaction == 'presend') $arrayofmassactions=array();
+//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
print ' |