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

NEW Change to allow a specific numbering rule for invoice with POS

Browse Source 
module.
This commit is contained in:
Laurent Destailleur 2017-02-02 23:49:17 +01:00
parent a42ad74a37
commit bdca134e99
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/cashdesk/validation_verif.php
View File

@ -57,14 +57,29 @@ switch ($action)
$invoice->date=dol_now(); $invoice->date=dol_now();
$invoice->type= Facture::TYPE_STANDARD; $invoice->type= Facture::TYPE_STANDARD;
// TODO
// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here // To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
// and restore after values just after // and restore values just after
$sav_FACTURE_ADDON='';
if (! empty($conf->global->POS_ADDON))
{
$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
$conf->global->FACTURE_ADDON = $conf->global->POS_ADDON;
// To force prefix only for POS with terre module
if (! empty($conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX)) $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX = $conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX;
// To force prefix only for POS with mars module
if (! empty($conf->global->POS_NUMBERING_MARS_FORCE_PREFIX)) $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX = $conf->global->POS_NUMBERING_MARS_FORCE_PREFIX;
// To force rule only for POS with mercure
//...
}
$num=$invoice->getNextNumRef($company); $num=$invoice->getNextNumRef($company);
// TODO Restore save values // Restore save values
if (! empty($sav_FACTURE_ADDON))
{
$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
}
$obj_facturation->numInvoice($num); $obj_facturation->numInvoice($num);

12
htdocs/core/modules/facture/mod_facture_mars.php
View File

@ -37,6 +37,18 @@ class mod_facture_mars extends ModeleNumRefFactures
var $prefixcreditnote='AV'; var $prefixcreditnote='AV';
var $error=''; var $error='';
/**
* Constructor
*/
function __construct()
{
if (! empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
{
$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
}
}
/** /**
* Renvoi la description du modele de numerotation * Renvoi la description du modele de numerotation
* *

12
htdocs/core/modules/facture/mod_facture_terre.php
View File

@ -35,6 +35,18 @@ class mod_facture_terre extends ModeleNumRefFactures
var $prefixdeposit='AC'; var $prefixdeposit='AC';
var $error=''; var $error='';
/**
* Constructor
*/
function __construct()
{
if (! empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
{
$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
}
}
/** /**
* Renvoi la description du modele de numerotation * Renvoi la description du modele de numerotation
* *