diff --git a/ChangeLog b/ChangeLog index 71a00e7b6eb..f8e2b24e501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,8 @@ All content added must be tagged by a '
' with css class="login_block_elem" this was not a good pratice, since object->id is already known, there is no need to provide id as parameter. All methods addline in this case were modified to remove this parameter. +4) Method ->classer_facturee() is deprecated. It must be replace with ->classifyBilled(). + ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** Fix: Display buying price on line edit when no supplier price is defined diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index dbdfd5f31aa..5d7f493f2cf 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1807,6 +1807,7 @@ class Propal extends CommonObject * Class invoiced the Propal * * @return int <0 si ko, >0 si ok + * @deprecated */ function classer_facturee() { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 78281cc07fd..804bd388526 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2222,6 +2222,7 @@ class Commande extends CommonOrder * Classify the order as invoiced * * @return int <0 if ko, >0 if ok + * @deprecated */ function classer_facturee() { diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 60b01bf14a3..806fd95a957 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Andreu Bisquerra Gaya @@ -96,9 +96,8 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; - if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - } + if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + $langs->load('bills'); $langs->load('products'); $langs->load('main'); @@ -127,7 +126,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) $lineid = GETPOST('lineid','int'); $userid = GETPOST('userid','int'); $search_ref = GETPOST('sf_ref')?GETPOST('sf_ref'):GETPOST('search_ref'); - $closeOrders = GETPOST('autocloseorders') != '' ? true : false; + $closeOrders = GETPOST('autocloseorders') ? true : false; // Security check $fieldid = GETPOST('ref','alpha')?'facnumber':'rowid'; @@ -214,8 +213,9 @@ if (($action == 'create' || $action == 'add') && empty($mesgs)) $result=$objectsrc->fetch($orders_id[$ii]); if ($result > 0) { - if($closeOrders) { - $objectsrc->classer_facturee(); + if ($closeOrders) + { + $objectsrc->classifyBilled(); $objectsrc->setStatut(3); } $lines = $objectsrc->lines; diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index 390692f2643..d49bff2e701 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -8,5 +8,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically a descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order to billed when customer invoice is set to paid -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify the customer's order as invoiced when the bill(s) are higher than the order +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang index 37b4aff492e..0edd36ac400 100644 --- a/htdocs/langs/fr_FR/workflow.lang +++ b/htdocs/langs/fr_FR/workflow.lang @@ -9,4 +9,4 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiqueme descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la clôture d'une commande client descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale source quand la commande client dérivée est classée payée descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source quand la facture client dérivée est classée payée -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer facturée la commande client source lorsque la facture ou les factures sont supérieures à la commande +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source lorsque la facture client dérivée est validée