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

Replacing invoice integer types with FactureFournisseur constants

Browse Source
This commit is contained in:
Marcos García de La Fuente 2014-02-26 01:09:34 +01:00
parent 0eedadd7f2
commit 607effdc7a
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,8 @@ class FactureFournisseur extends CommonInvoice
var $product_ref; var $product_ref;
var $ref_supplier; var $ref_supplier;
var $socid; var $socid;
//! 0=Standard invoice, 1=Replacement invoice, 2=Credit note invoice, 3=Deposit invoice, 4=Proforma invoice //Check constants for types
var $type; var $type = self::TYPE_STANDARD;
//! 0=draft, //! 0=draft,
//! 1=validated //! 1=validated
//! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null), //! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null),
@ -87,6 +87,30 @@ class FactureFournisseur extends CommonInvoice
var $extraparams=array(); var $extraparams=array();
/**
* Standard invoice
*/
const TYPE_STANDARD = 0;
/**
* Replacement invoice
*/
const TYPE_REPLACEMENT = 1;
/**
* Credit note invoice
*/
const TYPE_CREDIT_NOTE = 2;
/**
* Deposit invoice
*/
const TYPE_DEPOSIT = 3;
/**
* Proforma invoice
*/
const TYPE_PROFORMA = 4;
/** /**
* Constructor * Constructor
@ -338,7 +362,7 @@ class FactureFournisseur extends CommonInvoice
$this->ref_supplier = $obj->ref_supplier; $this->ref_supplier = $obj->ref_supplier;
$this->entity = $obj->entity; $this->entity = $obj->entity;
$this->type = empty($obj->type)?0:$obj->type; $this->type = empty($obj->type)? self::TYPE_STANDARD:$obj->type;
$this->fk_soc = $obj->fk_soc; $this->fk_soc = $obj->fk_soc;
$this->datec = $this->db->jdate($obj->datec); $this->datec = $this->db->jdate($obj->datec);
$this->date = $this->db->jdate($obj->datef); $this->date = $this->db->jdate($obj->datef);

4
htdocs/fourn/facture/document.php
View File

@ -125,13 +125,13 @@ if ($object->id > 0)
// Type // Type
print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">'; print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
print $object->getLibType(); print $object->getLibType();
if ($object->type == 1) if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
{ {
$facreplaced=new FactureFournisseur($db); $facreplaced=new FactureFournisseur($db);
$facreplaced->fetch($object->fk_facture_source); $facreplaced->fetch($object->fk_facture_source);
print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')'; print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
} }
if ($object->type == 2) if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
{ {
$facusing=new FactureFournisseur($db); $facusing=new FactureFournisseur($db);
$facusing->fetch($object->fk_facture_source); $facusing->fetch($object->fk_facture_source);

6
htdocs/fourn/facture/fiche.php
View File

@ -1518,13 +1518,13 @@ else
// Type // Type
print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">'; print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
print $object->getLibType(); print $object->getLibType();
if ($object->type == 1) if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
{ {
$facreplaced=new FactureFournisseur($db); $facreplaced=new FactureFournisseur($db);
$facreplaced->fetch($object->fk_facture_source); $facreplaced->fetch($object->fk_facture_source);
print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')'; print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
} }
if ($object->type == 2) if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
{ {
$facusing=new FactureFournisseur($db); $facusing=new FactureFournisseur($db);
$facusing->fetch($object->fk_facture_source); $facusing->fetch($object->fk_facture_source);
@ -2166,7 +2166,7 @@ else
} }
// Reopen a standard paid invoice // Reopen a standard paid invoice
if (($object->type == 0 || $object->type == 1) && ($object->statut == 2 || $object->statut == 3)) // A paid invoice (partially or completely) if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT) && ($object->statut == 2 || $object->statut == 3)) // A paid invoice (partially or completely)
{ {
if (! $facidnext && $object->close_code != 'replaced') // Not replaced by another invoice if (! $facidnext && $object->close_code != 'replaced') // Not replaced by another invoice
{ {

4
htdocs/fourn/facture/note.php
View File

@ -98,13 +98,13 @@ if ($object->id > 0)
// Type // Type
print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">'; print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
print $object->getLibType(); print $object->getLibType();
if ($object->type == 1) if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
{ {
$facreplaced=new FactureFournisseur($db); $facreplaced=new FactureFournisseur($db);
$facreplaced->fetch($object->fk_facture_source); $facreplaced->fetch($object->fk_facture_source);
print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')'; print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
} }
if ($object->type == 2) if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
{ {
$facusing=new FactureFournisseur($db); $facusing=new FactureFournisseur($db);
$facusing->fetch($object->fk_facture_source); $facusing->fetch($object->fk_facture_source);