lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Add default label into stock movement label

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-18 17:18:42 +00:00
parent a76e377f59
commit 5440ad97c6
5 changed files with 83 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
htdocs/compta/facture/class/facture.class.php
View File

@ -274,7 +274,7 @@ class Facture extends CommonObject
if (sizeof($this->lines) && is_object($this->lines[0]))
{
$fk_parent_line = 0;
dol_syslog("There is ".sizeof($this->lines)." lines that are invoice lines objects");
foreach ($this->lines as $i => $val)
{
@ -287,10 +287,10 @@ class Facture extends CommonObject
if (($newinvoiceline->product_type != 9 && empty($newinvoiceline->fk_parent_line)) || $newinvoiceline->product_type == 9) {
$fk_parent_line = 0;
}
$newinvoiceline->fk_parent_line=$fk_parent_line;
$result=$newinvoiceline->insert();
// Defined the new fk_parent_line
if ($result > 0 && $newinvoiceline->product_type == 9) {
$fk_parent_line = $result;
@ -307,7 +307,7 @@ class Facture extends CommonObject
else
{
$fk_parent_line = 0;
dol_syslog("There is ".sizeof($this->lines)." lines that are array lines");
foreach ($this->lines as $i => $val)
{
@ -317,7 +317,7 @@ class Facture extends CommonObject
if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
$fk_parent_line = 0;
}
$result = $this->addline(
$this->id,
$this->lines[$i]->desc,
@ -349,7 +349,7 @@ class Facture extends CommonObject
$this->db->rollback();
return -1;
}
// Defined the new fk_parent_line
if ($result > 0 && $this->lines[$i]->product_type == 9) {
$fk_parent_line = $result;
@ -514,7 +514,7 @@ class Facture extends CommonObject
global $conf,$user,$langs;
$error=0;
// Load source object
$objFrom=new Facture($this->db);
$objFrom->fetch($fromid);
@ -1108,7 +1108,7 @@ class Facture extends CommonObject
$sql.= ' WHERE fk_facture_source = '.$rowid;
$sql.= ' AND fk_facture_line IS NULL';
$resql=$this->db->query($sql);
// If invoice has consumned discounts
$list_rowid_det=array();
$sql = 'SELECT fd.rowid FROM '.MAIN_DB_PREFIX.'facturedet as fd WHERE fk_facture = '.$rowid;
@ -1412,10 +1412,10 @@ class Facture extends CommonObject
}
/**
* \brief Tag la facture comme validee + appel trigger BILL_VALIDATE
* \param user Utilisateur qui valide la facture
* \param force_number Reference a forcer de la facture
* \return int <0 si ko, >0 si ok
* Tag invoice as validated + call trigger BILL_VALIDATE
* @param user Object user that validate
* @param force_number Reference to force on invoice
* @return int <0 if KO, >0 if OK
*/
function validate($user, $force_number='')
{
@ -1493,7 +1493,7 @@ class Facture extends CommonObject
{
if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) // If option enabled, we force invoice date
{
$this->date=gmmktime();
$this->date=dol_now();
$this->date_lim_reglement=$this->calculate_date_lim_reglement();
}
$num = $this->getNextNumRef($this->client);
@ -1547,10 +1547,11 @@ class Facture extends CommonObject
{
if ($this->lines[$i]->fk_product > 0 && $this->lines[$i]->product_type == 0)
{
$langs->load("agenda");
$mouvP = new MouvementStock($this->db);
// We decrease stock for product
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice);
$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
if ($result < 0) { $error++; }
}
}
@ -1647,7 +1648,7 @@ class Facture extends CommonObject
dol_syslog("Facture::set_draft sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql))
{
// Si active on decremente le produit principal et ses composants a la validation de facture
// Si on decremente le produit principal et ses composants a la validation de facture, on réincrement
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
@ -1656,10 +1657,11 @@ class Facture extends CommonObject
{
if ($this->lines[$i]->fk_product && $this->lines[$i]->product_type == 0)
{
$langs->load("agenda");
$mouvP = new MouvementStock($this->db);
// We decrease stock for product
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice);
$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
}
}
}
@ -1825,7 +1827,7 @@ class Facture extends CommonObject
{
// Reorder if child line
if (! empty($fk_parent_line)) $this->line_order(true,'DESC');
// Mise a jour informations denormalisees au niveau de la facture meme
$this->id=$facid; // TODO To move this we must remove parameter facid into this function declaration
$result=$this->update_price(1);
@ -1994,16 +1996,16 @@ class Facture extends CommonObject
$this->db->rollback();
return -1;
}
$line=new FactureLigne($this->db);
// For triggers
$line->fetch($rowid);
if ($line->delete() > 0)
{
$result=$this->update_price(1);
if ($result > 0)
{
$this->db->commit();
@ -2442,7 +2444,7 @@ class Facture extends CommonObject
}
$obj = new $classname();
$numref = "";
$numref = $obj->getNumRef($soc,$this,$mode);
@ -2623,7 +2625,7 @@ class Facture extends CommonObject
global $conf;
if (! empty($conf->global->FACTURE_CAN_BE_REMOVED)) return 1;
// on verifie si la facture est en numerotation provisoire
$facref = substr($this->ref, 1, 4);
@ -3150,7 +3152,7 @@ class FactureLigne
var $libelle; // Product label (deprecated)
var $product_label; // Product label
var $product_desc; // Description produit
var $skip_update_total; // Skip update price total for special lines
@ -3178,12 +3180,12 @@ class FactureLigne
$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
$sql.= ' WHERE fd.rowid = '.$rowid;
$result = $this->db->query($sql);
if ($result)
{
$objp = $this->db->fetch_object($result);
$this->rowid = $objp->rowid;
$this->fk_facture = $objp->fk_facture;
$this->fk_parent_line = $objp->fk_parent_line;
@ -3457,7 +3459,7 @@ class FactureLigne
return -2;
}
}
/**
* Delete line in database
* @return int <0 si ko, >0 si ok
@ -3465,9 +3467,9 @@ class FactureLigne
function delete()
{
global $conf,$langs,$user;
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
dol_syslog("FactureLigne::delete sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql) )
@ -3478,9 +3480,9 @@ class FactureLigne
$result = $interface->run_triggers('LINEBILL_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
$this->db->commit();
return 1;
}
else
@ -3500,7 +3502,7 @@ class FactureLigne
{
$this->db->begin();
dol_syslog("FactureLigne::update_total", LOG_DEBUG);
// Clean parameters
if (empty($this->total_localtax1)) $this->total_localtax1=0;
if (empty($this->total_localtax2)) $this->total_localtax2=0;
@ -3513,7 +3515,7 @@ class FactureLigne
$sql.= ",total_localtax2=".price2num($this->total_localtax2)."";
$sql.= ",total_ttc=".price2num($this->total_ttc)."";
$sql.= " WHERE rowid = ".$this->rowid;
dol_syslog("PropaleLigne::update_total sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql);

63
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -606,10 +606,10 @@ class FactureFournisseur extends Facture
}
/**
* \brief Set supplier ref
* \param user User that make change
* \param ref_supplier Supplier ref
* \return int <0 if KO, >0 if OK
* Set supplier ref
* @param user User that make change
* @param ref_supplier Supplier ref
* @return int <0 if KO, >0 if OK
*/
function set_ref_supplier($user, $ref_supplier)
{
@ -687,11 +687,11 @@ class FactureFournisseur extends Facture
/**
* \brief Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
* Fonction utilisee quand un paiement prelevement est refuse,
* ou quand une facture annulee et reouverte.
* \param user Object user that change status
* \return int <0 si ok, >0 si ok
* Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
* Fonction utilisee quand un paiement prelevement est refuse,
* ou quand une facture annulee et reouverte.
* @param user Object user that change status
* @return int <0 si ok, >0 si ok
*/
function set_unpaid($user)
{
@ -737,11 +737,12 @@ class FactureFournisseur extends Facture
}
/**
* Set invoice status as validated
* @param user Object user
* @return int <0 if KO, =0 if nothing to do, >0 if OK
* Tag invoice as validated + call trigger BILL_VALIDATE
* @param user Object user that validate
* @param force_number Reference to force on invoice
* @return int <0 if KO, =0 if nothing to do, >0 if OK
*/
function validate($user)
function validate($user, $force_number='')
{
global $conf,$langs;
@ -763,7 +764,21 @@ class FactureFournisseur extends Facture
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
// Define new ref
if ($force_number)
{
$num = $force_number;
}
else if (preg_match('/^[\(]?PROV/i', $this->ref))
{
$num = $this->getNextNumRef($this->client);
}
else
{
$num = $this->ref;
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
$sql.= " SET fk_statut = 1, fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id;
@ -771,7 +786,7 @@ class FactureFournisseur extends Facture
$resql = $this->db->query($sql);
if ($resql)
{
// Si activé on décrémente le produit principal et ses composants à la validation de facture
// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
@ -780,10 +795,11 @@ class FactureFournisseur extends Facture
{
if ($this->lines[$i]->fk_product && $this->lines[$i]->product_type == 0)
{
$mouvP = new MouvementStock($this->db);
$langs->load("agenda");
$mouvP = new MouvementStock($this->db);
// We increase stock for product
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->pu_ht);
$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->pu_ht, $langs->trans("InvoiceValidatedInDolibarr",$num));
if ($result < 0) { $error++; }
}
}
@ -820,9 +836,9 @@ class FactureFournisseur extends Facture
/**
* \brief Set draft status
* \param user Object user that modify
* \param int <0 if KO, >0 if OK
* Set draft status
* @param user Object user that modify
* @param int <0 if KO, >0 if OK
*/
function set_draft($user)
{
@ -845,7 +861,7 @@ class FactureFournisseur extends Facture
dol_syslog("FactureFournisseur::set_draft sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql))
{
// Si active on decremente le produit principal et ses composants a la validation de facture
// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php");
@ -854,10 +870,11 @@ class FactureFournisseur extends Facture
{
if ($this->lines[$i]->fk_product && $this->lines[$i]->product_type == 0)
{
$mouvP = new MouvementStock($this->db);
$langs->load("agenda");
$mouvP = new MouvementStock($this->db);
// We increase stock for product
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice);
$result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr",$this->ref));
}
}
}

1
htdocs/langs/en_US/agenda.lang
View File

@ -35,6 +35,7 @@ AgendaExtSitesDesc=This page allows to configure external calendars.
ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
PropalValidatedInDolibarr= Proposal %s validated
InvoiceValidatedInDolibarr= Invoice %s validated
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
OrderValidatedInDolibarr= Order %s validated
InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail

1
htdocs/langs/fr_FR/agenda.lang
View File

@ -35,6 +35,7 @@ AgendaExtSitesDesc=Cette page permet de configurer les calendriers externes.
ActionsEvents=Événements pour lesquels Dolibarr doit créer une action dans l'agenda en automatique.
PropalValidatedInDolibarr=Proposition %s validée
InvoiceValidatedInDolibarr=Facture %s validée
InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
OrderValidatedInDolibarr=Commande %s validée
InterventionValidatedInDolibarr=Intervention %s validée
ProposalSentByEMail=Proposition commerciale %s envoyée par EMail

12
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -212,16 +212,16 @@ class MouvementStock
// Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$this->product_id = $fk_product;
$this->entrepot_id = $entrepot_id;
$this->qty = $qty;
$result=$interface->run_triggers('STOCK_MOVEMENT',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
}
if (! $error)
{
$this->db->commit();
@ -331,8 +331,9 @@ class MouvementStock
/**
* \brief Increase stock for product and subproducts
* \return int <0 if KO, >0 if OK
* Increase stock for product and subproducts
* @param label Label of stock movement
* @return int <0 if KO, >0 if OK
*/
function reception($user, $fk_product, $entrepot_id, $qty, $price=0, $label='')
{
@ -342,7 +343,6 @@ class MouvementStock
/**
* Return nb of subproducts lines for a product
*
* @param $id
* @return int
*/