';
- print '
';
+ print '
';
+ print '
';
+ print '
';
- print '
';
+ print '';
if ($soc->outstanding_limit)
{
- // Outstanding Bill
- print '';
- print $langs->trans('OutstandingBill');
- print ' ';
- print price($soc->get_OutstandingBill()) . ' / ';
- print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
- print ' ';
- print '';
+ print $langs->trans('OutstandingBill');
+ print ' ';
+ print price($soc->get_OutstandingBill()) . ' / ';
+ print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
+ print ' ';
+ print '';
- print '';
- print ' ';
- if ($action == 'editshippingmethod') {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
- } else {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editshippingmethod') {
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+ } else {
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+ }
+ print ' ';
+ print '';
- print '';
- print ' ';
- if ($action == 'editwarehouse') {
- $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
- } else {
- $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editwarehouse') {
+ $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
+ } else {
+ $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
+ }
+ print ' ';
+ print '';
@@ -2173,9 +2175,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '
';
print '';
if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
- if($action == 'actualizemulticurrencyrate') {
- list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
- }
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
} else {
$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
@@ -2243,30 +2245,30 @@ if ($action == 'create' && $user->rights->commande->creer)
$totalVolume=$tmparray['volume'];
if ($totalWeight || $totalVolume)
{
- print ' '.$langs->trans("CalculatedWeight").' ';
- print '';
- print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
- print ' '.$langs->trans("CalculatedVolume").' ';
- print '';
- print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
- print ' '.$langs->trans("CalculatedWeight").' ';
+ print '';
+ print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+ print ' '.$langs->trans("CalculatedVolume").' ';
+ print '';
+ print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+ print ' ';
- print '';
- print $langs->trans('IncotermLabel');
- print ' ';
- if ($user->rights->commande->creer) print ''.img_edit().' ';
- else print ' ';
- print '
';
- print ' ';
- print '';
+ print '';
+ print $langs->trans('IncotermLabel');
+ print ' ';
+ if ($user->rights->commande->creer) print ''.img_edit().' ';
+ else print ' ';
+ print '
';
+ print ' ';
+ print '';
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -2275,27 +2277,27 @@ if ($action == 'create' && $user->rights->commande->creer)
{
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
}
- print ' ';
- print '';
- print ' ';
- if ($action == 'editbankaccount') {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
- } else {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
- }
- print ' ';
- print '';
+ print '';
+ print ' ';
+ if ($action == 'editbankaccount') {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+ } else {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+ }
+ print ' ';
+ print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '';
+ print '
';
print '
';
// Show object lines
@@ -2421,7 +2423,7 @@ if ($action == 'create' && $user->rights->commande->creer)
}
}
print '
';
- print '
';
+ print '
' . $langs->trans("AddAction") . ' ';
}
@@ -2480,11 +2482,11 @@ if ($action == 'create' && $user->rights->commande->creer)
// Create contract
if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
- $langs->load("contracts");
+ $langs->load("contracts");
- if ($user->rights->contrat->creer) {
- print '';
- }
+ if ($user->rights->contrat->creer) {
+ print '';
+ }
}
// Ship
@@ -2527,9 +2529,9 @@ if ($action == 'create' && $user->rights->commande->creer)
}
}
if ($object->statut > Commande::STATUS_DRAFT && $object->billed) {
- if ($user->rights->commande->creer && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
- print '';
- }
+ if ($user->rights->commande->creer && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+ print '';
+ }
}
// Clone
if ($user->rights->commande->creer) {
@@ -2538,8 +2540,8 @@ if ($action == 'create' && $user->rights->commande->creer)
// Cancel order
if ($object->statut == Commande::STATUS_VALIDATED &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
+ ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
)
{
print '';
@@ -2571,8 +2573,8 @@ if ($action == 'create' && $user->rights->commande->creer)
$relativepath = $comref . '/' . $comref . '.pdf';
$filedir = $conf->commande->dir_output . '/' . $comref;
$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
- $genallowed = $user->rights->commande->creer;
- $delallowed = $user->rights->commande->supprimer;
+ $genallowed = $user->rights->commande->lire;
+ $delallowed = $user->rights->commande->creer;
print $formfile->showdocuments('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
diff --git a/htdocs/commande/class/api_deprecated_commande.class.php b/htdocs/commande/class/api_deprecated_commande.class.php
index d41fd9cee1d..f494709e441 100644
--- a/htdocs/commande/class/api_deprecated_commande.class.php
+++ b/htdocs/commande/class/api_deprecated_commande.class.php
@@ -107,7 +107,7 @@ class CommandeApi extends DolibarrApi
* @url GET /order/list
* @return array Array of order objects
*/
- function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $mode=0, $societe = 0) {
+ function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $societe = 0) {
global $db, $conf;
$obj_ret = array();
@@ -316,7 +316,7 @@ class CommandeApi extends DolibarrApi
);
if ($updateRes > 0) {
- return $this->get($id)->line->rowid;
+ return $updateRes;
}
return false;
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 6ffca33a4ce..e31aaa4e060 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -52,9 +52,9 @@ class Orders extends DolibarrApi
}
/**
- * Get properties of a commande object
+ * Get properties of an order object
*
- * Return an array with commande informations
+ * Return an array with order informations
*
* @param int $id ID of order
* @return array|mixed data without useless information
@@ -176,7 +176,7 @@ class Orders extends DolibarrApi
* Create order object
*
* @param array $request_data Request data
- * @return int ID of commande
+ * @return int ID of order
*/
function post($request_data = NULL)
{
@@ -196,6 +196,7 @@ class Orders extends DolibarrApi
}
$this->commande->lines = $lines;
}*/
+
if ($this->commande->create(DolibarrApiAccess::$user) < 0) {
throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
}
@@ -236,8 +237,8 @@ class Orders extends DolibarrApi
/**
* Add a line to given order
*
- * @param int $id Id of commande to update
- * @param array $request_data Orderline data
+ * @param int $id Id of order to update
+ * @param array $request_data OrderLine data
*
* @url POST {id}/lines
*
@@ -281,12 +282,13 @@ class Orders extends DolibarrApi
$request_data->label,
$request_data->array_options,
$request_data->fk_unit,
- $this->element,
- $request_data->id
+ $request_data->origin,
+ $request_data->origin_id,
+ $request_data->multicurrency_subprice
);
if ($updateRes > 0) {
- return $this->get($id)->line->rowid;
+ return $updateRes;
}
return false;
@@ -295,9 +297,9 @@ class Orders extends DolibarrApi
/**
* Update a line to given order
*
- * @param int $id Id of commande to update
+ * @param int $id Id of order to update
* @param int $lineid Id of line to update
- * @param array $request_data Orderline data
+ * @param array $request_data OrderLine data
*
* @url PUT {id}/lines/{lineid}
*
@@ -310,7 +312,7 @@ class Orders extends DolibarrApi
$result = $this->commande->fetch($id);
if( ! $result ) {
- throw new RestException(404, 'Commande not found');
+ throw new RestException(404, 'Order not found');
}
if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
@@ -338,7 +340,8 @@ class Orders extends DolibarrApi
$request_data->label,
$request_data->special_code,
$request_data->array_options,
- $request_data->fk_unit
+ $request_data->fk_unit,
+ $request_data->multicurrency_subprice
);
if ($updateRes > 0) {
@@ -387,7 +390,7 @@ class Orders extends DolibarrApi
/**
* Update order general fields (won't touch lines of order)
*
- * @param int $id Id of commande to update
+ * @param int $id Id of order to update
* @param array $request_data Datas
*
* @return int
@@ -399,7 +402,7 @@ class Orders extends DolibarrApi
$result = $this->commande->fetch($id);
if( ! $result ) {
- throw new RestException(404, 'Commande not found');
+ throw new RestException(404, 'Order not found');
}
if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
@@ -498,6 +501,47 @@ class Orders extends DolibarrApi
);
}
+ /**
+ * Close an order (Classify it as "Delivered")
+ *
+ * @param int $id Order ID
+ * @param int $notrigger Disabled triggers
+ *
+ * @url POST {id}/close
+ *
+ * @return array
+ */
+ function close($id, $notrigger=0)
+ {
+ if(! DolibarrApiAccess::$user->rights->commande->creer) {
+ throw new RestException(401);
+ }
+ $result = $this->commande->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Order not found');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $result = $this->commande->cloture(DolibarrApiAccess::$user, $notrigger);
+ if ($result == 0) {
+ throw new RestException(500, 'Error nothing done. May be object is already closed');
+ }
+ if ($result < 0) {
+ throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Order closed (Ref='.$this->commande->ref.')'
+ )
+ );
+ }
+
+
/**
* Clean sensible object datas
*
@@ -509,6 +553,10 @@ class Orders extends DolibarrApi
$object = parent::_cleanObjectDatas($object);
unset($object->address);
+ unset($object->barcode_type);
+ unset($object->barcode_type_code);
+ unset($object->barcode_type_label);
+ unset($object->barcode_type_coder);
return $object;
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1ad2d876478..e475615a3d1 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -557,9 +557,10 @@ class Commande extends CommonOrder
* Close order
*
* @param User $user Objet user that close
+ * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, >0 if OK
*/
- function cloture($user)
+ function cloture($user, $notrigger=0)
{
global $conf;
@@ -580,10 +581,13 @@ class Commande extends CommonOrder
if ($this->db->query($sql))
{
- // Call trigger
- $result=$this->call_trigger('ORDER_CLOSE',$user);
- if ($result < 0) $error++;
- // End call triggers
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result=$this->call_trigger('ORDER_CLOSE',$user);
+ if ($result < 0) $error++;
+ // End call triggers
+ }
if (! $error)
{
@@ -873,6 +877,11 @@ class Commande extends CommonOrder
{
$this->ref = $initialref;
+ if (! empty($this->linkedObjectsIds) && empty($this->linked_objects)) // To use new linkedObjectsIds instead of old linked_objects
+ {
+ $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+ }
+
// Add object linked
if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
{
@@ -885,7 +894,7 @@ class Commande extends CommonOrder
$ret = $this->add_object_linked($origin, $origin_id);
if (! $ret)
{
- dol_print_error($this->db);
+ $this->error=$this->db->lasterror();
$error++;
}
}
@@ -896,7 +905,7 @@ class Commande extends CommonOrder
$ret = $this->add_object_linked($origin, $origin_id);
if (! $ret)
{
- dol_print_error($this->db);
+ $this->error=$this->db->lasterror();
$error++;
}
}
@@ -1077,11 +1086,12 @@ class Commande extends CommonOrder
* Load an object from a proposal and create a new order into database
*
* @param Object $object Object source
+ * @param User $user User making creation
* @return int <0 if KO, 0 if nothing done, 1 if OK
*/
- function createFromProposal($object)
+ function createFromProposal($object, User $user)
{
- global $conf,$user,$hookmanager;
+ global $conf, $hookmanager;
dol_include_once('/core/class/extrafields.class.php');
@@ -1240,7 +1250,7 @@ class Commande extends CommonOrder
{
global $mysoc, $conf, $langs, $user;
- dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit", LOG_DEBUG);
+ dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1429,10 +1439,10 @@ class Commande extends CommonOrder
return -2;
}
}
- else
- {
+ else
+ {
dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
- return -3;
+ return -3;
}
}
@@ -1548,7 +1558,7 @@ class Commande extends CommonOrder
$sql.= ', c.fk_shipping_method';
$sql.= ', c.fk_warehouse';
$sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
- $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
+ $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.last_main_doc, c.fk_delivery_address, c.extraparams';
$sql.= ', c.fk_incoterms, c.location_incoterms';
$sql.= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
$sql.= ", i.libelle as libelle_incoterms";
@@ -1603,6 +1613,7 @@ class Commande extends CommonOrder
$this->note_public = $obj->note_public;
$this->fk_project = $obj->fk_projet;
$this->modelpdf = $obj->model_pdf;
+ $this->last_main_doc = $obj->last_main_doc;
$this->mode_reglement_id = $obj->fk_mode_reglement;
$this->mode_reglement_code = $obj->mode_reglement_code;
$this->mode_reglement = $obj->mode_reglement_libelle;
@@ -3048,48 +3059,6 @@ class Commande extends CommonOrder
}
}
- /**
- * Update value of extrafields on order
- *
- * @param User $user Object user that modify
- * @return int <0 if ko, >0 if ok
- */
- function update_extrafields($user)
- {
- global $hookmanager, $conf;
-
- $action='create';
- $error = 0;
-
- // Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('orderdao'));
- $parameters=array('id'=>$this->id);
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
- {
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
- {
- $result=$this->insertExtraFields();
- if ($result < 0)
- {
- $error++;
- }
- }
- }
- else if ($reshook < 0) $error++;
-
- if (!$error)
- {
- return 1;
- }
- else
- {
- return -1;
- }
-
- }
-
/**
* Delete the customer order
*
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 10c1459a087..c792f42f00e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1397,7 +1397,7 @@ if ($resql)
$filedir=$diroutputmassaction;
$genallowed=$user->rights->commande->lire;
- $delallowed=$user->rights->commande->supprimer;
+ $delallowed=$user->rights->commande->creer;
print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 326e3ece569..a829cdc8cba 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1114,7 +1114,7 @@ if ($resql)
$bankstatic->id=$banklinestatic->fk_account;
$bankstatic->label=$banklinestatic->bank_account_ref;
print ' ('.$langs->trans("TransferFrom").' ';
- print $bankstatic->getNomUrl(1);
+ print $bankstatic->getNomUrl(1,'transactions');
print ' '.$langs->trans("toward").' ';
$bankstatic->id=$objp->bankid;
$bankstatic->label=$objp->bankref;
@@ -1131,7 +1131,7 @@ if ($resql)
$banklinestatic->fetch($links[$key]['url_id']);
$bankstatic->id=$banklinestatic->fk_account;
$bankstatic->label=$banklinestatic->bank_account_ref;
- print $bankstatic->getNomUrl(1);
+ print $bankstatic->getNomUrl(1,'transactions');
print ')';
}
//var_dump($links);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index c6fd3f72def..fa540f43401 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -61,7 +61,7 @@ class BankAccounts extends DolibarrApi
*
* @throws RestException
*/
- function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '')
+ function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
{
$list = array();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 0ecfe01498f..19120e12888 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -74,7 +74,7 @@ $hookmanager->initHooks(array($contextpage));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('bankaccount');
+$extralabels = $extrafields->fetch_name_optionals_label('bank_account');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
// List of fields to search into when doing a "search in all"
@@ -143,7 +143,7 @@ $title=$langs->trans('BankAccounts');
// Load array of financial accounts (opened by default)
$accounts = array();
-$sql = "SELECT rowid, label, courant, rappro, account_number, fk_accountancy_journal, currency_code, datec as date_creation, tms as date_update";
+$sql = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_accountancy_journal, b.currency_code, b.datec as date_creation, b.tms as date_update";
// Add fields from extrafields
foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
// Add fields from hooks
@@ -151,7 +151,7 @@ $parameters=array();
$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook
$sql.=$hookmanager->resPrint;
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bankcacount_extrafields as ef on (c.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account_extrafields as ef on (b.rowid = ef.fk_object)";
$sql.= " WHERE entity IN (".getEntity('bank_account').")";
if ($search_status == 'opened') $sql.= " AND clos = 0";
if ($search_status == 'closed') $sql.= " AND clos = 1";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 55b128bcb6a..a6f37ae4fc3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -307,11 +307,11 @@ if (empty($reshook))
$date = dol_mktime(12, 0, 0, $_POST['invoicedatemonth'], $_POST['invoicedateday'], $_POST['invoicedateyear']);
if (empty($date))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
- header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate');
- exit;
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+ header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate');
+ exit;
}
- $object->date=$date;
+ $object->date=$date;
$new_date_lim_reglement = $object->calculate_date_lim_reglement();
if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
@@ -323,7 +323,7 @@ if (empty($reshook))
{
$object->fetch($id);
$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
- $object->date_pointoftax=$date_pointoftax;
+ $object->date_pointoftax=$date_pointoftax;
$result = $object->update($user);
if ($result < 0) dol_print_error($db, $object->error);
}
@@ -369,14 +369,14 @@ if (empty($reshook))
// Set incoterm
elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
- {
- $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
- }
+ {
+ $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+ }
// bank account
else if ($action == 'setbankaccount' && $user->rights->facture->creer)
{
- $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+ $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
}
else if ($action == 'setremisepercent' && $user->rights->facture->creer)
@@ -451,8 +451,8 @@ if (empty($reshook))
// Classify to validated
else if ($action == 'confirm_valid' && $confirm == 'yes' &&
- ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->validate)))
+ ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->validate)))
)
{
$idwarehouse = GETPOST('idwarehouse','int');
@@ -462,7 +462,7 @@ if (empty($reshook))
// Check parameters
- // Check for mandatory fields defined into setup
+ // Check for mandatory fields defined into setup
$array_to_check=array('IDPROF1','IDPROF2','IDPROF3','IDPROF4','IDPROF5','IDPROF6','EMAIL');
foreach($array_to_check as $key)
{
@@ -540,7 +540,7 @@ if (empty($reshook))
$ret = $object->fetch($id); // Reload to get new records
$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
- if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+ if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}
}
else
@@ -554,7 +554,7 @@ if (empty($reshook))
// Go back to draft status (unvalidate)
else if ($action == 'confirm_modif' &&
((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
)
{
$idwarehouse = GETPOST('idwarehouse');
@@ -831,7 +831,7 @@ if (empty($reshook))
$object->fk_project = $_POST['projectid'];
$object->cond_reglement_id = $_POST['cond_reglement_id'];
$object->mode_reglement_id = $_POST['mode_reglement_id'];
- $object->fk_account = GETPOST('fk_account', 'int');
+ $object->fk_account = GETPOST('fk_account', 'int');
$object->remise_absolue = $_POST['remise_absolue'];
$object->remise_percent = $_POST['remise_percent'];
$object->fk_incoterms = GETPOST('incoterm_id', 'int');
@@ -883,7 +883,7 @@ if (empty($reshook))
$object->fk_project = $_POST['projectid'];
$object->cond_reglement_id = 0;
$object->mode_reglement_id = $_POST['mode_reglement_id'];
- $object->fk_account = GETPOST('fk_account', 'int');
+ $object->fk_account = GETPOST('fk_account', 'int');
$object->remise_absolue = $_POST['remise_absolue'];
$object->remise_percent = $_POST['remise_percent'];
$object->fk_incoterms = GETPOST('incoterm_id', 'int');
@@ -899,62 +899,62 @@ if (empty($reshook))
if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0)
{
- $facture_source = new Facture($db); // fetch origin object
- if ($facture_source->fetch($object->fk_facture_source)>0)
- {
- $fk_parent_line = 0;
+ $facture_source = new Facture($db); // fetch origin object
+ if ($facture_source->fetch($object->fk_facture_source)>0)
+ {
+ $fk_parent_line = 0;
- foreach($facture_source->lines as $line)
- {
- // Reset fk_parent_line for no child products and special product
- if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
- $fk_parent_line = 0;
- }
+ foreach($facture_source->lines as $line)
+ {
+ // Reset fk_parent_line for no child products and special product
+ if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+ $fk_parent_line = 0;
+ }
- $line->fk_facture = $object->id;
- $line->fk_parent_line = $fk_parent_line;
+ $line->fk_facture = $object->id;
+ $line->fk_parent_line = $fk_parent_line;
- $line->subprice = -$line->subprice; // invert price for object
- $line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
- $line->total_ht = -$line->total_ht;
- $line->total_tva = -$line->total_tva;
- $line->total_ttc = -$line->total_ttc;
- $line->total_localtax1 = -$line->total_localtax1;
- $line->total_localtax2 = -$line->total_localtax2;
+ $line->subprice = -$line->subprice; // invert price for object
+ $line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
+ $line->total_ht = -$line->total_ht;
+ $line->total_tva = -$line->total_tva;
+ $line->total_ttc = -$line->total_ttc;
+ $line->total_localtax1 = -$line->total_localtax1;
+ $line->total_localtax2 = -$line->total_localtax2;
- $line->multicurrency_subprice = -$line->multicurrency_subprice;
- $line->multicurrency_total_ht = -$line->multicurrency_total_ht;
- $line->multicurrency_total_tva = -$line->multicurrency_total_tva;
- $line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
+ $line->multicurrency_subprice = -$line->multicurrency_subprice;
+ $line->multicurrency_total_ht = -$line->multicurrency_total_ht;
+ $line->multicurrency_total_tva = -$line->multicurrency_total_tva;
+ $line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
- $result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
+ $result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
- $object->lines[] = $line; // insert new line in current object
+ $object->lines[] = $line; // insert new line in current object
- // Defined the new fk_parent_line
- if ($result > 0 && $line->product_type == 9) {
- $fk_parent_line = $result;
- }
- }
+ // Defined the new fk_parent_line
+ if ($result > 0 && $line->product_type == 9) {
+ $fk_parent_line = $result;
+ }
+ }
- $object->update_price(1);
- }
+ $object->update_price(1);
+ }
}
- if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
- {
- $facture_source = new Facture($db); // fetch origin object if not previously defined
- if ($facture_source->fetch($object->fk_facture_source)>0)
- {
- $totalpaye = $facture_source->getSommePaiement();
- $totalcreditnotes = $facture_source->getSumCreditNotesUsed();
- $totaldeposits = $facture_source->getSumDepositsUsed();
- $remain_to_pay = abs($facture_source->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits);
+ if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
+ {
+ $facture_source = new Facture($db); // fetch origin object if not previously defined
+ if ($facture_source->fetch($object->fk_facture_source)>0)
+ {
+ $totalpaye = $facture_source->getSommePaiement();
+ $totalcreditnotes = $facture_source->getSumCreditNotesUsed();
+ $totaldeposits = $facture_source->getSumDepositsUsed();
+ $remain_to_pay = abs($facture_source->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits);
- $object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC');
- }
- }
+ $object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'),$remain_to_pay,1,0,0,0,0,0,'','','TTC');
+ }
+ }
}
}
@@ -985,7 +985,7 @@ if (empty($reshook))
$object->fk_project = $_POST['projectid'];
$object->cond_reglement_id = ($_POST['type'] == 3?1:$_POST['cond_reglement_id']);
$object->mode_reglement_id = $_POST['mode_reglement_id'];
- $object->fk_account = GETPOST('fk_account', 'int');
+ $object->fk_account = GETPOST('fk_account', 'int');
$object->amount = $_POST['amount'];
$object->remise_absolue = $_POST['remise_absolue'];
$object->remise_percent = $_POST['remise_percent'];
@@ -1035,7 +1035,7 @@ if (empty($reshook))
$object->fk_project = $_POST['projectid'];
$object->cond_reglement_id = ($_POST['type'] == 3?1:$_POST['cond_reglement_id']);
$object->mode_reglement_id = $_POST['mode_reglement_id'];
- $object->fk_account = GETPOST('fk_account', 'int');
+ $object->fk_account = GETPOST('fk_account', 'int');
$object->amount = $_POST['amount'];
$object->remise_absolue = $_POST['remise_absolue'];
$object->remise_percent = $_POST['remise_percent'];
@@ -1117,7 +1117,7 @@ if (empty($reshook))
dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines or deposit lines");
$result = $srcobject->fetch($object->origin_id);
- // If deposit invoice
+ // If deposit invoice
if ($_POST['type'] == Facture::TYPE_DEPOSIT)
{
$typeamount = GETPOST('typedeposit', 'alpha');
@@ -1167,8 +1167,8 @@ if (empty($reshook))
if ($totalamount != 0) {
if ($numlines > 0) $numlines = $numlines-1;
- $tva_tx = $lines[$numlines]->tva_tx;
- if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
+ $tva_tx = $lines[$numlines]->tva_tx;
+ if (! empty($lines[$numlines]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$numlines]->vat_src_code.')';
$amountdeposit[$tva_tx] = ($totalamount * $valuedeposit) / 100;
} else {
$amountdeposit[0] = 0;
@@ -1205,7 +1205,7 @@ if (empty($reshook))
0, // date_start
0, // date_end
0,
- $lines[$i]->info_bits, // info_bits
+ $lines[$i]->info_bits, // info_bits
0,
'HT',
0,
@@ -1367,8 +1367,8 @@ if (empty($reshook))
// modified by hook
if ($reshook < 0)
{
- setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $error++;
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ $error++;
}
} else {
@@ -1540,16 +1540,16 @@ if (empty($reshook))
setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
$error ++;
}
- if (!$prod_entry_mode)
- {
- if (GETPOST('type') < 0 && ! GETPOST('search_idprod'))
- {
- setEventMessages($langs->trans('ErrorChooseBetweenFreeEntryOrPredefinedProduct'), null, 'errors');
- $error ++;
- }
- }
+ if (!$prod_entry_mode)
+ {
+ if (GETPOST('type') < 0 && ! GETPOST('search_idprod'))
+ {
+ setEventMessages($langs->trans('ErrorChooseBetweenFreeEntryOrPredefinedProduct'), null, 'errors');
+ $error ++;
+ }
+ }
if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
$error ++;
}
if ($prod_entry_mode == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '') && $price_ht_devise == '') // Unit price can be 0 but not ''
@@ -1634,8 +1634,8 @@ if (empty($reshook))
$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility
{
- if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
- if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+ if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+ if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
if (empty($tva_tx)) $tva_npr=0;
}
}
@@ -1790,18 +1790,18 @@ if (empty($reshook))
unset($_POST['idprod']);
unset($_POST['units']);
- unset($_POST['date_starthour']);
- unset($_POST['date_startmin']);
- unset($_POST['date_startsec']);
- unset($_POST['date_startday']);
- unset($_POST['date_startmonth']);
- unset($_POST['date_startyear']);
- unset($_POST['date_endhour']);
- unset($_POST['date_endmin']);
- unset($_POST['date_endsec']);
- unset($_POST['date_endday']);
- unset($_POST['date_endmonth']);
- unset($_POST['date_endyear']);
+ unset($_POST['date_starthour']);
+ unset($_POST['date_startmin']);
+ unset($_POST['date_startsec']);
+ unset($_POST['date_startday']);
+ unset($_POST['date_startmonth']);
+ unset($_POST['date_startyear']);
+ unset($_POST['date_endhour']);
+ unset($_POST['date_endmin']);
+ unset($_POST['date_endsec']);
+ unset($_POST['date_endday']);
+ unset($_POST['date_endmonth']);
+ unset($_POST['date_endyear']);
unset($_POST['situations']);
unset($_POST['progress']);
@@ -1966,18 +1966,18 @@ if (empty($reshook))
unset($_POST['idprod']);
unset($_POST['units']);
- unset($_POST['date_starthour']);
- unset($_POST['date_startmin']);
- unset($_POST['date_startsec']);
- unset($_POST['date_startday']);
- unset($_POST['date_startmonth']);
- unset($_POST['date_startyear']);
- unset($_POST['date_endhour']);
- unset($_POST['date_endmin']);
- unset($_POST['date_endsec']);
- unset($_POST['date_endday']);
- unset($_POST['date_endmonth']);
- unset($_POST['date_endyear']);
+ unset($_POST['date_starthour']);
+ unset($_POST['date_startmin']);
+ unset($_POST['date_startsec']);
+ unset($_POST['date_startday']);
+ unset($_POST['date_startmonth']);
+ unset($_POST['date_startyear']);
+ unset($_POST['date_endhour']);
+ unset($_POST['date_endmin']);
+ unset($_POST['date_endsec']);
+ unset($_POST['date_endday']);
+ unset($_POST['date_endmonth']);
+ unset($_POST['date_endyear']);
unset($_POST['situations']);
unset($_POST['progress']);
@@ -2020,10 +2020,10 @@ if (empty($reshook))
$trackid='inv'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
- // Actions to build doc
- $upload_dir = $conf->facture->dir_output;
- $permissioncreate=$user->rights->facture->creer;
- include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+ // Actions to build doc
+ $upload_dir = $conf->facture->dir_output;
+ $permissioncreate=$user->rights->facture->creer;
+ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
if ($action == 'update_extras') {
@@ -2195,7 +2195,7 @@ if ($action == 'create')
$cond_reglement_id = (! empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(! empty($soc->cond_reglement_id)?$soc->cond_reglement_id:0));
$mode_reglement_id = (! empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(! empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
- $fk_account = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
+ $fk_account = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
$remise_percent = (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
$remise_absolue = (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
$dateinvoice = (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);
@@ -2238,14 +2238,14 @@ if ($action == 'create')
if ($origin == 'contrat')
{
- $langs->load("admin");
- $text=$langs->trans("ToCreateARecurringInvoice");
- $text.=' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
- if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE))
- {
- $text.=' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
- }
- print info_admin($text, 0, 0, 0).'';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
+ $langs->load("projects");
+ $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref.='';
+ $morehtmlref.=$proj->ref;
+ $morehtmlref.=' ';
+ } else {
+ $morehtmlref.='';
+ }
+ }
}
$morehtmlref.='';
@@ -3259,7 +3259,7 @@ else if ($id > 0 || ! empty($ref))
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(0, $object->id);
if ($result > 0){
- print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(), $discount->getNomUrl(1, 'discount')).'';
if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
- print ' id.'">'.img_edit($langs->trans('SetBankAccount'),1).' id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
';
print '
';
if ($action == 'editbankaccount')
{
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
}
else
{
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
}
print " ";
print '';
@@ -3568,14 +3568,14 @@ else if ($id > 0 || ! empty($ref))
if (!empty($conf->incoterm->enabled))
{
print '
';
- print '';
- print $langs->trans('IncotermLabel');
- print ' ';
- if ($user->rights->facture->creer) print ''.img_edit().' ';
- else print ' ';
- print '
';
- print ' ';
- print '';
+ print '';
+ print $langs->trans('IncotermLabel');
+ print ' ';
+ if ($user->rights->facture->creer) print ''.img_edit().' ';
+ else print ' ';
+ print '
';
+ print ' ';
+ print '';
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -3584,7 +3584,7 @@ else if ($id > 0 || ! empty($ref))
{
print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
}
- print ' ';
+ print '';
}
// Other attributes
@@ -3602,20 +3602,20 @@ else if ($id > 0 || ! empty($ref))
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
{
- // Multicurrency Amount HT
- print '
' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '';
+ // Multicurrency Amount HT
+ print '
' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
+ print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '';
- // Multicurrency Amount VAT
- print '
' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '';
+ // Multicurrency Amount VAT
+ print '
' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
+ print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '';
- // Multicurrency Amount TTC
- print '
' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
- print '';
+ // Multicurrency Amount TTC
+ print '
' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
+ print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
+ print '';
}
// Amount
@@ -3629,40 +3629,40 @@ else if ($id > 0 || ! empty($ref))
// Amount Local Taxes
if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) // Localtax1
{
- print '
' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ' ';
+ print '
' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ' ';
}
if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) // Localtax2
{
- print '
' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ' ';
+ print '
' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ' ';
}
// Revenue stamp
if ($selleruserevenustamp) // Test company use revenue stamp
{
- print '
';
- print '';
- print ' ';
- if ($action == 'editrevenuestamp') {
- print '';
- } else {
- print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
- }
- print ' ';
+ print '
';
+ print '';
+ print ' ';
+ if ($action == 'editrevenuestamp') {
+ print '';
+ } else {
+ print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
+ }
+ print ' ';
}
// Total with tax
@@ -3675,165 +3675,165 @@ else if ($id > 0 || ! empty($ref))
$sign = 1;
if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = - 1;
- $nbrows = 8;
- $nbcols = 3;
- if (! empty($conf->projet->enabled))
- $nbrows ++;
- if (! empty($conf->banque->enabled)) {
- $nbrows ++;
- $nbcols ++;
- }
- if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
- $nbrows ++;
- if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0)
- $nbrows ++;
- if ($selleruserevenustamp)
- $nbrows ++;
- if (! empty($conf->multicurrency->enabled))
- $nbrows += 5;
- if (! empty($conf->incoterm->enabled))
- $nbrows += 1;
+ $nbrows = 8;
+ $nbcols = 3;
+ if (! empty($conf->projet->enabled))
+ $nbrows ++;
+ if (! empty($conf->banque->enabled)) {
+ $nbrows ++;
+ $nbcols ++;
+ }
+ if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
+ $nbrows ++;
+ if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0)
+ $nbrows ++;
+ if ($selleruserevenustamp)
+ $nbrows ++;
+ if (! empty($conf->multicurrency->enabled))
+ $nbrows += 5;
+ if (! empty($conf->incoterm->enabled))
+ $nbrows += 1;
- if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION))
- {
- if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
- print '
';
+ if ($object->type == Facture::TYPE_SITUATION && ! empty($conf->global->INVOICE_USE_SITUATION))
+ {
+ if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
+ print '';
- if (count($object->tab_previous_situation_invoice) > 0) {
- // List of previous invoices
- print '';
- print '' . $langs->trans('ListOfPreviousSituationInvoices') . ' ';
- print '' . $langs->trans('AmountHT') . ' ';
- print '' . $langs->trans('AmountTTC') . ' ';
- print ' ';
- print ' ';
+ if (count($object->tab_previous_situation_invoice) > 0) {
+ // List of previous invoices
+ print '';
+ print '' . $langs->trans('ListOfPreviousSituationInvoices') . ' ';
+ print '' . $langs->trans('AmountHT') . ' ';
+ print '' . $langs->trans('AmountTTC') . ' ';
+ print ' ';
+ print ' ';
- $total_prev_ht = $total_prev_ttc = 0;
- foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
- $totalpaye = $prev_invoice->getSommePaiement();
- $total_prev_ht += $prev_invoice->total_ht;
- $total_prev_ttc += $prev_invoice->total_ttc;
- print '';
- print '' . $prev_invoice->getNomUrl(1) . ' ';
- print '' . price($prev_invoice->total_ht) . ' ';
- print '' . price($prev_invoice->total_ttc) . ' ';
- print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ' ';
- print ' ';
+ $total_prev_ht = $total_prev_ttc = 0;
+ foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
+ $totalpaye = $prev_invoice->getSommePaiement();
+ $total_prev_ht += $prev_invoice->total_ht;
+ $total_prev_ttc += $prev_invoice->total_ttc;
+ print '';
+ print '' . $prev_invoice->getNomUrl(1) . ' ';
+ print '' . price($prev_invoice->total_ht) . ' ';
+ print '' . price($prev_invoice->total_ttc) . ' ';
+ print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ' ';
+ print ' ';
- }
+ }
- print '';
- print '' . price($total_prev_ht) . ' ' . price($total_prev_ttc) . ' ';
- print ' ';
- }
+ print '';
+ print '' . price($total_prev_ht) . ' ' . price($total_prev_ttc) . ' ';
+ print ' ';
+ }
- if (count($object->tab_next_situation_invoice) > 0) {
- // List of next invoices
- print '';
- print '' . $langs->trans('ListOfNextSituationInvoices') . ' ';
- print '' . $langs->trans('AmountHT') . ' ';
- print '' . $langs->trans('AmountTTC') . ' ';
- print ' ';
- print ' ';
+ if (count($object->tab_next_situation_invoice) > 0) {
+ // List of next invoices
+ print '';
+ print '' . $langs->trans('ListOfNextSituationInvoices') . ' ';
+ print '' . $langs->trans('AmountHT') . ' ';
+ print '' . $langs->trans('AmountTTC') . ' ';
+ print ' ';
+ print ' ';
- $total_next_ht = $total_next_ttc = 0;
+ $total_next_ht = $total_next_ttc = 0;
- foreach ($object->tab_next_situation_invoice as $next_invoice) {
- $totalpaye = $next_invoice->getSommePaiement();
- $total_next_ht += $next_invoice->total_ht;
- $total_next_ttc += $next_invoice->total_ttc;
- print '';
- print '' . $next_invoice->getNomUrl(1) . ' ';
- print '' . price($next_invoice->total_ht) . ' ';
- print '' . price($next_invoice->total_ttc) . ' ';
- print '' . $next_invoice->getLibStatut(3, $totalpaye) . ' ';
- print ' ';
+ foreach ($object->tab_next_situation_invoice as $next_invoice) {
+ $totalpaye = $next_invoice->getSommePaiement();
+ $total_next_ht += $next_invoice->total_ht;
+ $total_next_ttc += $next_invoice->total_ttc;
+ print '';
+ print '' . $next_invoice->getNomUrl(1) . ' ';
+ print '' . price($next_invoice->total_ht) . ' ';
+ print '' . price($next_invoice->total_ttc) . ' ';
+ print '' . $next_invoice->getLibStatut(3, $totalpaye) . ' ';
+ print ' ';
- }
+ }
- print '';
- print ' ';
+ print '' . price($total_next_ht) . ' ' . price($total_next_ttc) . ' ';
- print ' ';
- }
+ print '' . price($total_next_ht) . ' ' . price($total_next_ttc) . ' ';
+ print '';
+ }
- if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
- print '
';
- }
+ if (count($object->tab_previous_situation_invoice) > 0 || count($object->tab_next_situation_invoice) > 0)
+ print '
';
+ }
- // List of payments already done
+ // List of payments already done
- print '
';
+ print '';
- print '';
- print '' . ($object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' ';
- print '' . $langs->trans('Date') . ' ';
- print '' . $langs->trans('Type') . ' ';
- if (! empty($conf->banque->enabled)) {
- print '' . $langs->trans('BankAccount') . ' ';
- }
- print '' . $langs->trans('Amount') . ' ';
- print ' ';
- print ' ';
+ print '';
+ print '' . ($object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' ';
+ print '' . $langs->trans('Date') . ' ';
+ print '' . $langs->trans('Type') . ' ';
+ if (! empty($conf->banque->enabled)) {
+ print '' . $langs->trans('BankAccount') . ' ';
+ }
+ print '' . $langs->trans('Amount') . ' ';
+ print ' ';
+ print ' ';
- // Payments already done (from payment on this invoice)
- $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
- $sql .= ' c.code as payment_code, c.libelle as payment_label,';
- $sql .= ' pf.amount,';
- $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
- $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
- $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
- $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
- $sql .= ' WHERE pf.fk_facture = ' . $object->id . ' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
- $sql .= ' AND c.entity IN (' . getEntity('c_paiement').')';
- $sql .= ' ORDER BY p.datep, p.tms';
+ // Payments already done (from payment on this invoice)
+ $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
+ $sql .= ' c.code as payment_code, c.libelle as payment_label,';
+ $sql .= ' pf.amount,';
+ $sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_paiement as c, ' . MAIN_DB_PREFIX . 'paiement_facture as pf, ' . MAIN_DB_PREFIX . 'paiement as p';
+ $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank as b ON p.fk_bank = b.rowid';
+ $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
+ $sql .= ' WHERE pf.fk_facture = ' . $object->id . ' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid';
+ $sql .= ' AND c.entity IN (' . getEntity('c_paiement').')';
+ $sql .= ' ORDER BY p.datep, p.tms';
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- $i = 0;
+ $result = $db->query($sql);
+ if ($result) {
+ $num = $db->num_rows($result);
+ $i = 0;
- // if ($object->type != 2)
- // {
- if ($num > 0) {
- while ($i < $num) {
- $objp = $db->fetch_object($result);
+ // if ($object->type != 2)
+ // {
+ if ($num > 0) {
+ while ($i < $num) {
+ $objp = $db->fetch_object($result);
- $paymentstatic->id = $objp->rowid;
- $paymentstatic->datepaye = $db->jdate($objp->dp);
- $paymentstatic->ref = $objp->ref;
- $paymentstatic->num_paiement = $objp->num_paiement;
- $paymentstatic->payment_code = $objp->payment_code;
+ $paymentstatic->id = $objp->rowid;
+ $paymentstatic->datepaye = $db->jdate($objp->dp);
+ $paymentstatic->ref = $objp->ref;
+ $paymentstatic->num_paiement = $objp->num_paiement;
+ $paymentstatic->payment_code = $objp->payment_code;
- print '';
- print $paymentstatic->getNomUrl(1);
- print ' ';
- print '' . dol_print_date($db->jdate($objp->dp), 'day') . ' ';
- $label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
- print '' . $label . ' ' . $objp->num_paiement . ' ';
- if (! empty($conf->banque->enabled))
- {
- $bankaccountstatic->id = $objp->baid;
- $bankaccountstatic->ref = $objp->baref;
- $bankaccountstatic->label = $objp->baref;
+ print '';
+ print $paymentstatic->getNomUrl(1);
+ print ' ';
+ print '' . dol_print_date($db->jdate($objp->dp), 'day') . ' ';
+ $label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
+ print '' . $label . ' ' . $objp->num_paiement . ' ';
+ if (! empty($conf->banque->enabled))
+ {
+ $bankaccountstatic->id = $objp->baid;
+ $bankaccountstatic->ref = $objp->baref;
+ $bankaccountstatic->label = $objp->baref;
$bankaccountstatic->number = $objp->banumber;
if (! empty($conf->accounting->enabled)) {
@@ -3845,155 +3845,155 @@ else if ($id > 0 || ! empty($ref))
}
print '';
- if ($bankaccountstatic->id)
- print $bankaccountstatic->getNomUrl(1, 'transactions');
- print ' ';
- }
- print '' . price($sign * $objp->amount) . ' ';
- print ' ';
- print '' . price($sign * $objp->amount) . ' ';
+ print ' ';
+ print '';
+ $i ++;
+ }
+ }
+ /*else {
print '' . $langs->trans("None") . ' ';
- if ($object->type != Facture::TYPE_DEPOSIT)
- print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
- else
- print $langs->trans('AlreadyPaid');
- print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' ';
+ if ($object->type != Facture::TYPE_DEPOSIT)
+ print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
+ else
+ print $langs->trans('AlreadyPaid');
+ print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' ';
- if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
- print $langs->trans("CreditNote") . ' ';
- if ($invoice->type == Facture::TYPE_DEPOSIT)
- print $langs->trans("Deposit") . ' ';
- print $invoice->getNomUrl(0);
- print ' : ';
- print '' . price($obj->amount_ttc) . ' ';
- print '';
- print 'rowid . '">' . img_delete() . ' ';
- print ' ';
+ if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
+ print $langs->trans("CreditNote") . ' ';
+ if ($invoice->type == Facture::TYPE_DEPOSIT)
+ print $langs->trans("Deposit") . ' ';
+ print $invoice->getNomUrl(0);
+ print ' : ';
+ print '' . price($obj->amount_ttc) . ' ';
+ print '';
+ print 'rowid . '">' . img_delete() . ' ';
+ print ' ';
- print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1);
- print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1);
- print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1);
- print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
- $text = $langs->trans("HelpAbandonOther");
- if ($object->close_note)
- $text .= '' . $langs->trans("Reason") . ' :' . $object->close_note;
- print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1);
- print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
+ print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
+ print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
+ print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ';
+ $text = $langs->trans("HelpAbandonOther");
+ if ($object->close_note)
+ $text .= '' . $langs->trans("Reason") . ' :' . $object->close_note;
+ print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1);
+ print ' ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' ' . $langs->trans("Billed") . ' : ' . price($object->total_ttc) . ' ' . $langs->trans("Billed") . ' : ' . price($object->total_ttc) . ' ';
- if ($resteapayeraffiche >= 0)
- print $langs->trans('RemainderToPay');
- else
- print $langs->trans('ExcessReceived');
- print ' : ';
- print '' . price($resteapayeraffiche) . ' ';
- print ' ';
+ if ($resteapayeraffiche >= 0)
+ print $langs->trans('RemainderToPay');
+ else
+ print $langs->trans('ExcessReceived');
+ print ' : ';
+ print '' . price($resteapayeraffiche) . ' ';
+ print ' ';
- print $langs->trans('AlreadyPaidBack');
- print ' : ' . price($sign * $totalpaye) . ' ';
+ print $langs->trans('AlreadyPaidBack');
+ print ' : ' . price($sign * $totalpaye) . ' ' . $langs->trans("Billed") . ' : ' . price($sign * $object->total_ttc) . ' ' . $langs->trans("Billed") . ' : ' . price($sign * $object->total_ttc) . ' ';
- if ($resteapayeraffiche <= 0)
- print $langs->trans('RemainderToPayBack');
- else
- print $langs->trans('ExcessPaydBack');
- print ' : ';
- print '' . price($sign * $resteapayeraffiche) . ' ';
- print ' ';
+ if ($resteapayeraffiche <= 0)
+ print $langs->trans('RemainderToPayBack');
+ else
+ print $langs->trans('ExcessPaydBack');
+ print ' : ';
+ print '' . price($sign * $resteapayeraffiche) . ' ';
+ print ' '.$langs->trans('TotalTTC').' : ';
- // print ''.price($sign *
- // $object->total_ttc).' '.$langs->trans('TotalTTC').' : ';
+ // print ''.price($sign *
+ // $object->total_ttc).'
';
+ print '
';
// Margin Infos
if (! empty($conf->margin->enabled)) {
- $formmargin->displayMarginInfos($object);
+ $formmargin->displayMarginInfos($object);
}
print '
';
@@ -4084,7 +4084,7 @@ else if ($id > 0 || ! empty($ref))
';
if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
- include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+ include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
}
print '
';
@@ -4110,7 +4110,7 @@ else if ($id > 0 || ! empty($ref))
}
print "\n";
- print "
";
+ print "
";
print "\n";
@@ -4138,8 +4138,8 @@ else if ($id > 0 || ! empty($ref))
{
if (! $objectidnext && $object->is_last_in_cycle())
{
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
{
print '
';
} else {
@@ -4166,7 +4166,7 @@ else if ($id > 0 || ! empty($ref))
|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id)))
&& ($object->statut == 2 || $object->statut == 3 || ($object->statut == 1 && $object->paye == 1)) // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
- && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->invoice_advance->reopen))) // A paid invoice (partially or completely)
+ && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->invoice_advance->reopen))) // A paid invoice (partially or completely)
{
if (! $objectidnext && $object->close_code != 'replaced') // Not replaced by another invoice
{
@@ -4179,7 +4179,7 @@ else if ($id > 0 || ! empty($ref))
// Validate
if ($object->statut == Facture::STATUS_DRAFT && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) && (! empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->validate)))
+ || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->validate)))
{
print '
';
}
@@ -4200,22 +4200,22 @@ else if ($id > 0 || ! empty($ref))
// Request a direct debit order
if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0)
{
- if ($resteapayer > 0)
- {
- if ($user->rights->prelevement->bons->creer)
- {
- $langs->load("withdrawals");
- print '
'.$langs->trans("MakeWithdrawRequest").' ';
- }
- else
- {
- //print '
'.$langs->trans("MakeWithdrawRequest").' ';
- }
- }
- else
- {
- //print '
'.$langs->trans("MakeWithdrawRequest").' ';
- }
+ if ($resteapayer > 0)
+ {
+ if ($user->rights->prelevement->bons->creer)
+ {
+ $langs->load("withdrawals");
+ print '
'.$langs->trans("MakeWithdrawRequest").' ';
+ }
+ else
+ {
+ //print '
'.$langs->trans("MakeWithdrawRequest").' ';
+ }
+ }
+ else
+ {
+ //print '
'.$langs->trans("MakeWithdrawRequest").' ';
+ }
}
// Create payment
@@ -4364,8 +4364,8 @@ else if ($id > 0 || ! empty($ref))
$filename = dol_sanitizeFileName($object->ref);
$filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
$urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id;
- $genallowed = $user->rights->facture->creer;
- $delallowed = $user->rights->facture->supprimer;
+ $genallowed = $user->rights->facture->lire;
+ $delallowed = $user->rights->facture->creer;
print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
$somethingshown = $formfile->numoffiles;
@@ -4378,7 +4378,7 @@ else if ($id > 0 || ! empty($ref))
// Show online payment link
$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
- if ($object->statut != 0 && $useonlinepayment)
+ if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment)
{
print '
';
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/compta/facture/class/api_deprecated_invoice.class.php b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
index 360c065a5f2..ac2086fc87e 100644
--- a/htdocs/compta/facture/class/api_deprecated_invoice.class.php
+++ b/htdocs/compta/facture/class/api_deprecated_invoice.class.php
@@ -23,7 +23,7 @@
* API class for invoice object
*
* @smart-auto-routing false
- * @access protected
+ * @access protected
* @class DolibarrApiAccess {@requires user,external}
* @deprecated Use Invoices instead (defined in api_invoices.class.php)
*/
@@ -31,7 +31,7 @@ class InvoiceApi extends DolibarrApi
{
/**
*
- * @var array $FIELDS Mandatory fields, checked when create and update object
+ * @var array $FIELDS Mandatory fields, checked when create and update object
*/
static $FIELDS = array(
'socid'
@@ -46,7 +46,7 @@ class InvoiceApi extends DolibarrApi
* Constructor
Warning: Deprecated
*
* @url GET invoice/
- *
+ *
*/
function __construct()
{
@@ -59,7 +59,7 @@ class InvoiceApi extends DolibarrApi
* Get properties of a invoice object
Warning: Deprecated
*
* Return an array with invoice informations
- *
+ *
* @param int $id ID of invoice
* @return array|mixed data without useless information
*
@@ -67,16 +67,16 @@ class InvoiceApi extends DolibarrApi
* @throws RestException
*/
function get($id)
- {
+ {
if(! DolibarrApiAccess::$user->rights->facture->lire) {
throw new RestException(401);
}
-
+
$result = $this->invoice->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Facture not found');
}
-
+
if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -86,9 +86,9 @@ class InvoiceApi extends DolibarrApi
/**
* List invoices
Warning: Deprecated
- *
+ *
* Get a list of invoices
- *
+ *
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
@@ -101,15 +101,15 @@ class InvoiceApi extends DolibarrApi
* @url GET invoice/list
* @url GET invoice/list/{mode}
* @url GET thirdparty/{socid}/invoice/list
- * @url GET thirdparty/{socid}/invoice/list/{mode}
+ * @url GET thirdparty/{socid}/invoice/list/{mode}
*/
- function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $socid=0, $mode='') {
+ function getList($sortfield = "s.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $socid=0, $mode='') {
global $db, $conf;
-
+
$obj_ret = array();
-
+
$socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $socid;
-
+
// If the internal user must only see his customers, force searching by him
$search_sale = 0;
if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
@@ -117,27 +117,27 @@ class InvoiceApi extends DolibarrApi
$sql = "SELECT s.rowid";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
$sql.= " FROM ".MAIN_DB_PREFIX."facture as s";
-
+
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
$sql.= ' WHERE s.entity IN ('.getEntity('facture').')';
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
if ($socid) $sql.= " AND s.fk_soc = ".$socid;
if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-
-
+
+
// Example of use $mode
if ($mode == 'draft') $sql.= " AND s.fk_statut IN (0)";
if ($mode == 'unpaid') $sql.= " AND s.fk_statut IN (1)";
if ($mode == 'paid') $sql.= " AND s.fk_statut IN (2)";
if ($mode == 'cancelled') $sql.= " AND s.fk_statut IN (3)";
-
+
// Insert sale filter
if ($search_sale > 0)
{
$sql .= " AND sc.fk_user = ".$search_sale;
}
-
+
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
@@ -180,10 +180,10 @@ class InvoiceApi extends DolibarrApi
}
return $obj_ret;
}
-
+
/**
* Create invoice object
Warning: Deprecated
- *
+ *
* @param array $request_data Request datas
* @return int ID of invoice
*
@@ -196,7 +196,7 @@ class InvoiceApi extends DolibarrApi
}
// Check mandatory fields
$result = $this->_validate($request_data);
-
+
foreach($request_data as $field => $value) {
$this->invoice->$field = $value;
}
@@ -213,9 +213,9 @@ class InvoiceApi extends DolibarrApi
* Update invoice
Warning: Deprecated
*
* @param int $id Id of invoice to update
- * @param array $request_data Datas
- * @return int
- *
+ * @param array $request_data Datas
+ * @return int
+ *
* @url PUT invoice/{id}
*/
function put($id, $request_data = NULL)
@@ -223,12 +223,12 @@ class InvoiceApi extends DolibarrApi
if(! DolibarrApiAccess::$user->rights->facture->creer) {
throw new RestException(401);
}
-
+
$result = $this->invoice->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Facture not found');
}
-
+
if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -237,20 +237,20 @@ class InvoiceApi extends DolibarrApi
if ($field == 'id') continue;
$this->invoice->$field = $value;
}
-
+
if($this->invoice->update($id, DolibarrApiAccess::$user))
return $this->get ($id);
-
+
return false;
}
-
+
/**
* Delete invoice
Warning: Deprecated
*
* @param int $id Invoice ID
* @return type
- *
- * @url DELETE invoice/{id}
+ *
+ * @url DELETE invoice/{id}
*/
function delete($id)
{
@@ -261,31 +261,31 @@ class InvoiceApi extends DolibarrApi
if( ! $result ) {
throw new RestException(404, 'Facture not found');
}
-
+
if( ! DolibarrApi::_checkAccessToResource('facture',$this->facture->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
-
+
if( !$this->invoice->delete(DolibarrApiAccess::$user))
{
throw new RestException(500);
}
-
+
return array(
'success' => array(
'code' => 200,
'message' => 'Facture deleted'
)
);
-
+
}
-
+
/**
* Validate fields before create or update object
- *
+ *
* @param array $data Datas to validate
* @return array
- *
+ *
* @throws RestException
*/
function _validate($data)
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index d8a5a231593..344a5d280c7 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -15,9 +15,9 @@
* along with this program. If not, see
.
*/
- use Luracast\Restler\RestException;
+use Luracast\Restler\RestException;
- require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
/**
* API class for invoices
@@ -75,6 +75,7 @@ class Invoices extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
+ $this->invoice->fetchObjectLinked();
return $this->_cleanObjectDatas($this->invoice);
}
@@ -94,7 +95,7 @@ class Invoices extends DolibarrApi
*
* @throws RestException
*/
- function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
+ function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
global $db, $conf;
$obj_ret = array();
@@ -210,6 +211,142 @@ class Invoices extends DolibarrApi
return $this->invoice->id;
}
+ /**
+ * Get lines of an invoice
+ *
+ * @param int $id Id of invoice
+ *
+ * @url GET {id}/lines
+ *
+ * @return int
+ */
+ function getLines($id) {
+ if(! DolibarrApiAccess::$user->rights->facture->lire) {
+ throw new RestException(401);
+ }
+
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $this->invoice->getLinesArray();
+ $result = array();
+ foreach ($this->invoice->lines as $line) {
+ array_push($result,$this->_cleanObjectDatas($line));
+ }
+ return $result;
+ }
+
+ /**
+ * Update a line to a given invoice
+ *
+ * @param int $id Id of invoice to update
+ * @param int $lineid Id of line to update
+ * @param array $request_data InvoiceLine data
+ *
+ * @url PUT {id}/lines/{lineid}
+ *
+ * @return object
+ */
+ function putLine($id, $lineid, $request_data = NULL) {
+ if(! DolibarrApiAccess::$user->rights->facture->creer) {
+ throw new RestException(401);
+ }
+
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $request_data = (object) $request_data;
+ $updateRes = $this->invoice->updateline(
+ $lineid,
+ $request_data->desc,
+ $request_data->subprice,
+ $request_data->qty,
+ $request_data->remise_percent,
+ $request_data->date_start,
+ $request_data->date_end,
+ $request_data->tva_tx,
+ $request_data->localtax1_tx,
+ $request_data->localtax2_tx,
+ 'HT',
+ $request_data->info_bits,
+ $request_data->product_type,
+ $request_data->fk_parent_line,
+ 0,
+ $request_data->fk_fournprice,
+ $request_data->pa_ht,
+ $request_data->label,
+ $request_data->special_code,
+ $request_data->array_options,
+ $request_data->situation_percent,
+ $request_data->fk_unit,
+ $request_data->multicurrency_subprice
+ );
+
+ if ($updateRes > 0) {
+ $result = $this->get($id);
+ unset($result->line);
+ return $this->_cleanObjectDatas($result);
+ }
+ return false;
+ }
+
+ /**
+ * Deletes a line of a given invoice
+ *
+ * @param int $id Id of invoice
+ * @param int $lineid Id of the line to delete
+ *
+ * @url DELETE {id}/lines/{lineid}
+ *
+ * @return array
+ * @throws 400
+ * @throws 401
+ * @throws 404
+ * @throws 405
+ */
+ function deleteLine($id, $lineid) {
+
+ if(! DolibarrApiAccess::$user->rights->facture->creer) {
+ throw new RestException(401);
+ }
+ if(empty($lineid)) {
+ throw new RestException(400, 'Line ID is mandatory');
+ }
+
+ if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $result = $this->invoice->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'Invoice not found');
+ }
+
+ $result = $this->invoice->deleteline($lineid);
+ if( $result < 0) {
+ throw new RestException(405, $this->invoice->error);
+ }
+
+ $result = $this->invoice->fetch($id);
+
+ $this->invoice->getLinesArray();
+ $result = array();
+ foreach ($this->invoice->lines as $line) {
+ array_push($result,$this->_cleanObjectDatas($line));
+ }
+ return $result;
+ }
+
/**
* Update invoice
*
@@ -276,95 +413,15 @@ class Invoices extends DolibarrApi
);
}
- /**
- * Get lines of a given invoice
- *
- * @param int $id Id of invoice
- *
- * @url GET {id}/lines
- *
- * @return array
- */
- function getLines($id) {
- if(! DolibarrApiAccess::$user->rights->facture->lire) {
- throw new RestException(401);
- }
-
- $result = $this->invoice->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'Invoice not found');
- }
-
- if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
- $this->invoice->getLinesArray();
- $result = array();
- foreach ($this->invoice->lines as $line) {
- array_push($result,$this->_cleanObjectDatas($line));
- }
- return $result;
- }
-
- /**
- * Deletes a line of a given invoice
- *
- * @param int $id Id of invoice
- * @param int $lineid Id of the line to delete
- *
- * @url DELETE {id}/lines/{lineid}
- *
- * @return array
- * @throws 400
- * @throws 401
- * @throws 404
- * @throws 405
- */
- function deleteLine($id, $lineid) {
-
- if(! DolibarrApiAccess::$user->rights->facture->creer) {
- throw new RestException(401);
- }
- if(empty($lineid)) {
- throw new RestException(400, 'Line ID is mandatory');
- }
-
- if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
-
- $result = $this->invoice->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'Invoice not found');
- }
-
- $result = $this->invoice->deleteline($lineid);
- if( $result < 0) {
- throw new RestException(405, $this->invoice->error);
- }
-
- $result = $this->invoice->fetch($id);
-
- $this->invoice->getLinesArray();
- $result = array();
- foreach ($this->invoice->lines as $line) {
- array_push($result,$this->_cleanObjectDatas($line));
- }
- return $result;
- }
-
-
-
-
/**
* Add a line to a given invoice
*
* Exemple of POST query : { "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000", "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0, "info_bits": "0", "fk_remise_except": null, "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null, "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null }
*
* @param int $id Id of invoice
- * @param array $request_data Invoiceline data
+ * @param array $request_data InvoiceLine data
*
- * @url POST {id}/addline
+ * @url POST {id}/lines
*
* @return int
*/
@@ -421,7 +478,7 @@ class Invoices extends DolibarrApi
);
if ($updateRes > 0) {
- return $this->get($id)->line->rowid;
+ return $updateRes;
}
throw new RestException(400, 'Unable to insert the new line. Check your inputs.');
@@ -482,7 +539,7 @@ class Invoices extends DolibarrApi
/**
* Validate an invoice
*
- * @param int $id Order ID
+ * @param int $id Invoice ID
* @param int $idwarehouse Warehouse ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
*
@@ -600,6 +657,10 @@ class Invoices extends DolibarrApi
$object = parent::_cleanObjectDatas($object);
unset($object->address);
+ unset($object->barcode_type);
+ unset($object->barcode_type_code);
+ unset($object->barcode_type_label);
+ unset($object->barcode_type_coder);
return $object;
}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index dd42c8d3fb7..b46c249d1b0 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -201,19 +201,40 @@ class FactureRec extends CommonInvoice
}
}
- // Add object linked
- if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
- {
- foreach($this->linked_objects as $origin => $origin_id)
- {
- $ret = $this->add_object_linked($origin, $origin_id);
- if (! $ret)
- {
- $this->error=$this->db->lasterror();
- $error++;
- }
- }
- }
+ if (! empty($this->linkedObjectsIds) && empty($this->linked_objects)) // To use new linkedObjectsIds instead of old linked_objects
+ {
+ $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+ }
+
+ // Add object linked
+ if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+ {
+ foreach($this->linked_objects as $origin => $tmp_origin_id)
+ {
+ if (is_array($tmp_origin_id)) // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+ {
+ foreach($tmp_origin_id as $origin_id)
+ {
+ $ret = $this->add_object_linked($origin, $origin_id);
+ if (! $ret)
+ {
+ $this->error=$this->db->lasterror();
+ $error++;
+ }
+ }
+ }
+ else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+ {
+ $origin_id = $tmp_origin_id;
+ $ret = $this->add_object_linked($origin, $origin_id);
+ if (! $ret)
+ {
+ $this->error=$this->db->lasterror();
+ $error++;
+ }
+ }
+ }
+ }
if ($error)
{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6452c689215..a1997318aad 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -448,6 +448,11 @@ class Facture extends CommonInvoice
$resql=$this->db->query($sql);
if (! $resql) $error++;
+ if (! empty($this->linkedObjectsIds) && empty($this->linked_objects)) // To use new linkedObjectsIds instead of old linked_objects
+ {
+ $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+ }
+
// Add object linked
if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
{
@@ -460,7 +465,7 @@ class Facture extends CommonInvoice
$ret = $this->add_object_linked($origin, $origin_id);
if (! $ret)
{
- dol_print_error($this->db);
+ $this->error=$this->db->lasterror();
$error++;
}
}
@@ -471,7 +476,7 @@ class Facture extends CommonInvoice
$ret = $this->add_object_linked($origin, $origin_id);
if (! $ret)
{
- dol_print_error($this->db);
+ $this->error=$this->db->lasterror();
$error++;
}
}
@@ -747,7 +752,7 @@ class Facture extends CommonInvoice
* @param int $invertdetail Reverse sign of amounts for lines
* @return int <0 if KO, >0 if OK
*/
- function createFromCurrent($user,$invertdetail=0)
+ function createFromCurrent(User $user, $invertdetail=0)
{
global $conf;
@@ -948,11 +953,12 @@ class Facture extends CommonInvoice
* Load an object from an order and create a new invoice into database
*
* @param Object $object Object source
+ * @param User $user Object user
* @return int <0 if KO, 0 if nothing done, 1 if OK
*/
- function createFromOrder($object)
+ function createFromOrder($object, User $user)
{
- global $user,$hookmanager;
+ global $hookmanager;
$error=0;
@@ -1192,7 +1198,7 @@ class Facture extends CommonInvoice
$sql.= ', f.datec as datec';
$sql.= ', f.date_valid as datev';
$sql.= ', f.tms as datem';
- $sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
+ $sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf, f.last_main_doc';
$sql.= ', f.fk_facture_source';
$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
$sql.= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
@@ -1261,6 +1267,7 @@ class Facture extends CommonInvoice
$this->user_author = $obj->fk_user_author;
$this->user_valid = $obj->fk_user_valid;
$this->modelpdf = $obj->model_pdf;
+ $this->last_main_doc = $obj->last_main_doc;
$this->situation_cycle_ref = $obj->situation_cycle_ref;
$this->situation_counter = $obj->situation_counter;
$this->situation_final = $obj->situation_final;
@@ -2686,6 +2693,11 @@ class Facture extends CommonInvoice
return -2;
}
}
+ else
+ {
+ dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+ return -3;
+ }
}
/**
@@ -2698,7 +2710,7 @@ class Facture extends CommonInvoice
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $date_start Date de debut de validite du service
* @param int $date_end Date de fin de validite du service
- * @param double $txtva VAT Rate
+ * @param double $txtva VAT Rate (Can be '8.5', '8.5 (ABC)')
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param string $price_base_type HT or TTC
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index b2fd603a394..b6874862286 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -39,7 +39,7 @@ class FactureStats extends Stats
var $from;
var $field;
var $where;
-
+
/**
* Constructor
@@ -56,8 +56,8 @@ class FactureStats extends Stats
$this->db = $db;
$this->socid = ($socid > 0 ? $socid : 0);
$this->userid = $userid;
- $this->cachefilesuffix = $mode;
-
+ $this->cachefilesuffix = $mode;
+
if ($mode == 'customer')
{
$object=new Facture($this->db);
@@ -195,7 +195,7 @@ class FactureStats extends Stats
return $this->_getAllByYear($sql);
}
-
+
/**
* Return nb, amount of predefined product for year
*
@@ -218,7 +218,7 @@ class FactureStats extends Stats
return $this->_getAllByProduct($sql);
}
-
-
+
+
}
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index deffb252d9c..fbdabad8fa0 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -34,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
if (! empty($conf->projet->enabled)) {
- require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
- //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+ //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
}
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
@@ -129,526 +129,526 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
- if (GETPOST('cancel','alpha')) $action='';
+ if (GETPOST('cancel','alpha')) $action='';
- // Selection of new fields
- include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
- // Set note
- include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+ // Set note
+ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
- include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
+ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
- include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+ include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
- // Do we click on purge search criteria ?
- if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
- {
- $search_ref='';
- $search_societe='';
- $search_montant_ht='';
- $search_montant_vat='';
- $search_montant_ttc='';
- $search_montant_mode='';
- $search_montant_term='';
- $day='';
- $year='';
- $month='';
- $day_date_when='';
- $year_date_when='';
- $month_date_when='';
- $search_recurring='';
- $search_frequency='';
- $search_unit_frequency='';
- $search_array_options=array();
- }
+ // Do we click on purge search criteria ?
+ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+ {
+ $search_ref='';
+ $search_societe='';
+ $search_montant_ht='';
+ $search_montant_vat='';
+ $search_montant_ttc='';
+ $search_montant_mode='';
+ $search_montant_term='';
+ $day='';
+ $year='';
+ $month='';
+ $day_date_when='';
+ $year_date_when='';
+ $month_date_when='';
+ $search_recurring='';
+ $search_frequency='';
+ $search_unit_frequency='';
+ $search_array_options=array();
+ }
- // Mass actions
- /*$objectclass='MyObject';
+ // Mass actions
+ /*$objectclass='MyObject';
$objectlabel='MyObject';
$permtoread = $user->rights->mymodule->read;
$permtodelete = $user->rights->mymodule->delete;
$uploaddir = $conf->mymodule->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
- // Create predefined invoice
- if ($action == 'add')
- {
- if (! GETPOST('titre'))
- {
- setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors');
- $action = "create";
- $error++;
- }
+ // Create predefined invoice
+ if ($action == 'add')
+ {
+ if (! GETPOST('titre'))
+ {
+ setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
- $frequency=GETPOST('frequency', 'int');
- $reyear=GETPOST('reyear');
- $remonth=GETPOST('remonth');
- $reday=GETPOST('reday');
- $rehour=GETPOST('rehour');
- $remin=GETPOST('remin');
- $nb_gen_max=GETPOST('nb_gen_max', 'int');
- //if (empty($nb_gen_max)) $nb_gen_max =0;
+ $frequency=GETPOST('frequency', 'int');
+ $reyear=GETPOST('reyear');
+ $remonth=GETPOST('remonth');
+ $reday=GETPOST('reday');
+ $rehour=GETPOST('rehour');
+ $remin=GETPOST('remin');
+ $nb_gen_max=GETPOST('nb_gen_max', 'int');
+ //if (empty($nb_gen_max)) $nb_gen_max =0;
- if (GETPOST('frequency'))
- {
- if (empty($reyear) || empty($remonth) || empty($reday))
- {
- setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors');
- $action = "create";
- $error++;
- }
- if ($nb_gen_max === '')
- {
- setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
- $action = "create";
- $error++;
- }
- }
+ if (GETPOST('frequency'))
+ {
+ if (empty($reyear) || empty($remonth) || empty($reday))
+ {
+ setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+ if ($nb_gen_max === '')
+ {
+ setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+ }
- if (! $error)
- {
- $object->titre = GETPOST('titre', 'alpha');
- $object->note_private = GETPOST('note_private','none');
- $object->note_public = GETPOST('note_public','none');
- $object->usenewprice = GETPOST('usenewprice');
+ if (! $error)
+ {
+ $object->titre = GETPOST('titre', 'alpha');
+ $object->note_private = GETPOST('note_private','none');
+ $object->note_public = GETPOST('note_public','none');
+ $object->usenewprice = GETPOST('usenewprice');
- $object->frequency = $frequency;
- $object->unit_frequency = GETPOST('unit_frequency', 'alpha');
- $object->nb_gen_max = $nb_gen_max;
- $object->auto_validate = GETPOST('auto_validate', 'int');
+ $object->frequency = $frequency;
+ $object->unit_frequency = GETPOST('unit_frequency', 'alpha');
+ $object->nb_gen_max = $nb_gen_max;
+ $object->auto_validate = GETPOST('auto_validate', 'int');
- $object->fk_project = $projectid;
+ $object->fk_project = $projectid;
- $date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
- $object->date_when = $date_next_execution;
+ $date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
+ $object->date_when = $date_next_execution;
- // Get first contract linked to invoice used to generate template
- if ($id > 0)
- {
- $srcObject = new Facture($db);
- $srcObject->fetch(GETPOST('facid','int'));
+ // Get first contract linked to invoice used to generate template
+ if ($id > 0)
+ {
+ $srcObject = new Facture($db);
+ $srcObject->fetch(GETPOST('facid','int'));
- $srcObject->fetchObjectLinked();
+ $srcObject->fetchObjectLinked();
- if (! empty($srcObject->linkedObjectsIds['contrat']))
- {
- $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
+ if (! empty($srcObject->linkedObjectsIds['contrat']))
+ {
+ $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
- $object->origin = 'contrat';
- $object->origin_id = $contractidid;
- $object->linked_objects[$object->origin] = $object->origin_id;
- }
- }
+ $object->origin = 'contrat';
+ $object->origin_id = $contractidid;
+ $object->linked_objects[$object->origin] = $object->origin_id;
+ }
+ }
- $db->begin();
+ $db->begin();
- $oldinvoice = new Facture($db);
- $oldinvoice->fetch($id);
+ $oldinvoice = new Facture($db);
+ $oldinvoice->fetch($id);
- $result = $object->create($user, $oldinvoice->id);
- if ($result > 0)
- {
- $result=$oldinvoice->delete($user, 1);
- if ($result < 0)
- {
- $error++;
- setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
- $action = "create";
- }
- }
- else
- {
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
- $action = "create";
- }
+ $result = $object->create($user, $oldinvoice->id);
+ if ($result > 0)
+ {
+ $result=$oldinvoice->delete($user, 1);
+ if ($result < 0)
+ {
+ $error++;
+ setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
+ $action = "create";
+ }
+ }
+ else
+ {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action = "create";
+ }
- if (! $error)
- {
- $db->commit();
+ if (! $error)
+ {
+ $db->commit();
- header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
- exit;
- }
- else
- {
- $db->rollback();
+ header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
+ exit;
+ }
+ else
+ {
+ $db->rollback();
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
- $action = "create";
- }
- }
- }
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action = "create";
+ }
+ }
+ }
- // Delete
- if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer)
- {
- $object->delete($user);
- header("Location: " . $_SERVER['PHP_SELF'] );
- exit;
- }
+ // Delete
+ if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer)
+ {
+ $object->delete($user);
+ header("Location: " . $_SERVER['PHP_SELF'] );
+ exit;
+ }
- // Update field
- // Set condition
- if ($action == 'setconditions' && $user->rights->facture->creer)
- {
- $result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+ // Update field
+ // Set condition
+ if ($action == 'setconditions' && $user->rights->facture->creer)
+ {
+ $result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
- }
- // Set mode
- elseif ($action == 'setmode' && $user->rights->facture->creer)
- {
- $result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
- }
- // Set project
- elseif ($action == 'classin' && $user->rights->facture->creer)
- {
- $object->setProject(GETPOST('projectid', 'int'));
- }
- // Set bank account
- elseif ($action == 'setref' && $user->rights->facture->creer)
- {
- //var_dump(GETPOST('ref', 'alpha'));exit;
- $result=$object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
- if ($result > 0)
- {
- $object->titre = GETPOST('ref', 'alpha');
- $object->ref = $object->titre;
- }
- else dol_print_error($db, $object->error, $object->errors);
- }
- // Set bank account
- elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
- {
- $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
- }
- // Set frequency and unit frequency
- elseif ($action == 'setfrequency' && $user->rights->facture->creer)
- {
- $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
- }
- // Set next date of execution
- elseif ($action == 'setdate_when' && $user->rights->facture->creer)
- {
- $date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
- if (!empty($date)) $object->setNextDate($date);
- }
- // Set max period
- elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
- {
- $object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
- }
- // Set auto validate
- elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
- {
- $object->setAutoValidate(GETPOST('auto_validate', 'int'));
- }
+ }
+ // Set mode
+ elseif ($action == 'setmode' && $user->rights->facture->creer)
+ {
+ $result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+ }
+ // Set project
+ elseif ($action == 'classin' && $user->rights->facture->creer)
+ {
+ $object->setProject(GETPOST('projectid', 'int'));
+ }
+ // Set bank account
+ elseif ($action == 'setref' && $user->rights->facture->creer)
+ {
+ //var_dump(GETPOST('ref', 'alpha'));exit;
+ $result=$object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
+ if ($result > 0)
+ {
+ $object->titre = GETPOST('ref', 'alpha');
+ $object->ref = $object->titre;
+ }
+ else dol_print_error($db, $object->error, $object->errors);
+ }
+ // Set bank account
+ elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
+ {
+ $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+ }
+ // Set frequency and unit frequency
+ elseif ($action == 'setfrequency' && $user->rights->facture->creer)
+ {
+ $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+ }
+ // Set next date of execution
+ elseif ($action == 'setdate_when' && $user->rights->facture->creer)
+ {
+ $date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+ if (!empty($date)) $object->setNextDate($date);
+ }
+ // Set max period
+ elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
+ {
+ $object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+ }
+ // Set auto validate
+ elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
+ {
+ $object->setAutoValidate(GETPOST('auto_validate', 'int'));
+ }
- // Delete line
- if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
- {
- $object->fetch($id);
- $object->fetch_thirdparty();
+ // Delete line
+ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
+ {
+ $object->fetch($id);
+ $object->fetch_thirdparty();
- $db->begin();
+ $db->begin();
- $line=new FactureLigneRec($db);
+ $line=new FactureLigneRec($db);
- // For triggers
- $line->id = $lineid;
+ // For triggers
+ $line->id = $lineid;
- if ($line->delete($user) > 0)
- {
- $result=$object->update_price(1);
+ if ($line->delete($user) > 0)
+ {
+ $result=$object->update_price(1);
- if ($result > 0)
- {
- $db->commit();
- $object->fetch($object->id); // Reload lines
- }
- else
- {
- $db->rollback();
- setEventMessages($db->lasterror(), null, 'errors');
- }
- }
- else
- {
- $db->rollback();
- setEventMessages($line->error, $line->errors, 'errors');
- }
- }
- else if ($action == 'update_extras')
- {
- // Fill array 'array_options' with data from update form
- $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
- $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
- if ($ret < 0)
- $error ++;
+ if ($result > 0)
+ {
+ $db->commit();
+ $object->fetch($object->id); // Reload lines
+ }
+ else
+ {
+ $db->rollback();
+ setEventMessages($db->lasterror(), null, 'errors');
+ }
+ }
+ else
+ {
+ $db->rollback();
+ setEventMessages($line->error, $line->errors, 'errors');
+ }
+ }
+ else if ($action == 'update_extras')
+ {
+ // Fill array 'array_options' with data from update form
+ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+ $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+ if ($ret < 0)
+ $error ++;
- if (! $error) {
+ if (! $error) {
- $result = $object->insertExtraFields();
- if ($result < 0) {
- $error ++;
- }
- } else if ($reshook < 0)
- $error ++;
+ $result = $object->insertExtraFields();
+ if ($result < 0) {
+ $error ++;
+ }
+ } else if ($reshook < 0)
+ $error ++;
- if ($error) {
- $action = 'edit_extras';
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
+ if ($error) {
+ $action = 'edit_extras';
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
- // Add a new line
- if ($action == 'addline' && $user->rights->facture->creer)
- {
- $langs->load('errors');
- $error = 0;
+ // Add a new line
+ if ($action == 'addline' && $user->rights->facture->creer)
+ {
+ $langs->load('errors');
+ $error = 0;
- // Set if we used free entry or predefined product
- $predef='';
- $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
- $price_ht = GETPOST('price_ht');
- if (GETPOST('prod_entry_mode') == 'free')
- {
- $idprod=0;
- $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
- }
- else
- {
- $idprod=GETPOST('idprod', 'int');
- $tva_tx = '';
- }
+ // Set if we used free entry or predefined product
+ $predef='';
+ $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+ $price_ht = GETPOST('price_ht');
+ if (GETPOST('prod_entry_mode') == 'free')
+ {
+ $idprod=0;
+ $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+ }
+ else
+ {
+ $idprod=GETPOST('idprod', 'int');
+ $tva_tx = '';
+ }
- $qty = GETPOST('qty' . $predef);
- $remise_percent = GETPOST('remise_percent' . $predef);
+ $qty = GETPOST('qty' . $predef);
+ $remise_percent = GETPOST('remise_percent' . $predef);
- // Extrafields
- $extrafieldsline = new ExtraFields($db);
- $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
- $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
- // Unset extrafield
- if (is_array($extralabelsline))
- {
- // Get extra fields
- foreach ($extralabelsline as $key => $value) {
- unset($_POST["options_" . $key . $predef]);
- }
- }
+ // Extrafields
+ $extrafieldsline = new ExtraFields($db);
+ $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+ $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+ // Unset extrafield
+ if (is_array($extralabelsline))
+ {
+ // Get extra fields
+ foreach ($extralabelsline as $key => $value) {
+ unset($_POST["options_" . $key . $predef]);
+ }
+ }
- if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
- setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
- $error ++;
- }
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
- $error ++;
- }
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) // Unit price can be 0 but not ''
- {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
- $error ++;
- }
- if ($qty == '') {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
- $error ++;
- }
- if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
- $error ++;
- }
- if ($qty < 0) {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
- $error ++;
- }
+ if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+ setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+ $error ++;
+ }
+ if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
+ $error ++;
+ }
+ if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) // Unit price can be 0 but not ''
+ {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
+ $error ++;
+ }
+ if ($qty == '') {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+ $error ++;
+ }
+ if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
+ $error ++;
+ }
+ if ($qty < 0) {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+ $error ++;
+ }
- if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
- {
- $ret = $object->fetch($id);
- if ($ret < 0) {
- dol_print_error($db, $object->error);
- exit();
- }
- $ret = $object->fetch_thirdparty();
+ if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
+ {
+ $ret = $object->fetch($id);
+ if ($ret < 0) {
+ dol_print_error($db, $object->error);
+ exit();
+ }
+ $ret = $object->fetch_thirdparty();
- // Clean parameters
- $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
- $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
- $price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
+ // Clean parameters
+ $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
+ $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+ $price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
- // Define special_code for special lines
- $special_code = 0;
- // if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
+ // Define special_code for special lines
+ $special_code = 0;
+ // if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
- // Ecrase $pu par celui du produit
- // Ecrase $desc par celui du produit
- // Ecrase $tva_tx par celui du produit
- // Ecrase $base_price_type par celui du produit
- // Replaces $fk_unit with the product's
- if (! empty($idprod))
- {
- $prod = new Product($db);
- $prod->fetch($idprod);
+ // Ecrase $pu par celui du produit
+ // Ecrase $desc par celui du produit
+ // Ecrase $tva_tx par celui du produit
+ // Ecrase $base_price_type par celui du produit
+ // Replaces $fk_unit with the product's
+ if (! empty($idprod))
+ {
+ $prod = new Product($db);
+ $prod->fetch($idprod);
- $label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
+ $label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
- // Update if prices fields are defined
- $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
- $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
- if (empty($tva_tx)) $tva_npr=0;
+ // Update if prices fields are defined
+ $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+ $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+ if (empty($tva_tx)) $tva_npr=0;
- $pu_ht = $prod->price;
- $pu_ttc = $prod->price_ttc;
- $price_min = $prod->price_min;
- $price_base_type = $prod->price_base_type;
+ $pu_ht = $prod->price;
+ $pu_ttc = $prod->price_ttc;
+ $price_min = $prod->price_min;
+ $price_base_type = $prod->price_base_type;
- // We define price for product
- if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
- {
- $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
- $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
- $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
- $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
- if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility
- {
- if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
- if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
- if (empty($tva_tx)) $tva_npr=0;
- }
- }
- elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
- {
- require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+ // We define price for product
+ if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+ {
+ $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+ $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+ $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+ $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+ if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility
+ {
+ if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+ if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+ if (empty($tva_tx)) $tva_npr=0;
+ }
+ }
+ elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+ {
+ require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
- $prodcustprice = new Productcustomerprice($db);
+ $prodcustprice = new Productcustomerprice($db);
- $filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+ $filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
- $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
- if ($result)
- {
- if (count($prodcustprice->lines) > 0)
- {
- $pu_ht = price($prodcustprice->lines[0]->price);
- $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
- $price_base_type = $prodcustprice->lines[0]->price_base_type;
- $tva_tx = $prodcustprice->lines[0]->tva_tx;
- }
- }
- }
+ $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+ if ($result)
+ {
+ if (count($prodcustprice->lines) > 0)
+ {
+ $pu_ht = price($prodcustprice->lines[0]->price);
+ $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+ $price_base_type = $prodcustprice->lines[0]->price_base_type;
+ $tva_tx = $prodcustprice->lines[0]->tva_tx;
+ }
+ }
+ }
$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
- // if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
- if (! empty($price_ht))
- {
- $pu_ht = price2num($price_ht, 'MU');
- $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
- }
- // On reevalue prix selon taux tva car taux tva transaction peut etre different
- // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
- elseif ($tmpvat != $tmpprodvat)
- {
- if ($price_base_type != 'HT')
- {
- $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
- }
- else
- {
- $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
- }
- }
+ // if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
+ if (! empty($price_ht))
+ {
+ $pu_ht = price2num($price_ht, 'MU');
+ $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+ }
+ // On reevalue prix selon taux tva car taux tva transaction peut etre different
+ // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+ elseif ($tmpvat != $tmpprodvat)
+ {
+ if ($price_base_type != 'HT')
+ {
+ $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+ }
+ else
+ {
+ $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+ }
+ }
- $desc = '';
+ $desc = '';
- // Define output language
- if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
- {
- $outputlangs = $langs;
- $newlang = '';
- if (empty($newlang) && GETPOST('lang_id','aZ09'))
- $newlang = GETPOST('lang_id','aZ09');
- if (empty($newlang))
- $newlang = $object->thirdparty->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("", $conf);
- $outputlangs->setDefaultLang($newlang);
- }
+ // Define output language
+ if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+ {
+ $outputlangs = $langs;
+ $newlang = '';
+ if (empty($newlang) && GETPOST('lang_id','aZ09'))
+ $newlang = GETPOST('lang_id','aZ09');
+ if (empty($newlang))
+ $newlang = $object->thirdparty->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
- $desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
- }
- else
- {
- $desc = $prod->description;
- }
+ $desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+ }
+ else
+ {
+ $desc = $prod->description;
+ }
- $desc = dol_concatdesc($desc, $product_desc);
+ $desc = dol_concatdesc($desc, $product_desc);
- // Add custom code and origin country into description
- if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
- {
- $tmptxt = '(';
- if (! empty($prod->customcode))
- $tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
- if (! empty($prod->customcode) && ! empty($prod->country_code))
- $tmptxt .= ' - ';
- if (! empty($prod->country_code))
- $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
- $tmptxt .= ')';
- $desc = dol_concatdesc($desc, $tmptxt);
+ // Add custom code and origin country into description
+ if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+ {
+ $tmptxt = '(';
+ if (! empty($prod->customcode))
+ $tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+ if (! empty($prod->customcode) && ! empty($prod->country_code))
+ $tmptxt .= ' - ';
+ if (! empty($prod->country_code))
+ $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+ $tmptxt .= ')';
+ $desc = dol_concatdesc($desc, $tmptxt);
- }
+ }
- $type = $prod->type;
- $fk_unit = $prod->fk_unit;
+ $type = $prod->type;
+ $fk_unit = $prod->fk_unit;
- }
- else
- {
- $pu_ht = price2num($price_ht, 'MU');
- $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
- $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
- $tva_tx = str_replace('*', '', $tva_tx);
- if (empty($tva_tx)) $tva_npr=0;
- $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
- $desc = $product_desc;
- $type = GETPOST('type');
- $fk_unit= GETPOST('units', 'alpha');
- }
+ }
+ else
+ {
+ $pu_ht = price2num($price_ht, 'MU');
+ $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+ $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+ $tva_tx = str_replace('*', '', $tva_tx);
+ if (empty($tva_tx)) $tva_npr=0;
+ $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+ $desc = $product_desc;
+ $type = GETPOST('type');
+ $fk_unit= GETPOST('units', 'alpha');
+ }
- // Margin
- $fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
- $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
+ // Margin
+ $fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+ $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
- // Local Taxes
- $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
- $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
+ // Local Taxes
+ $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+ $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
- $info_bits = 0;
- if ($tva_npr)
- $info_bits |= 0x01;
+ $info_bits = 0;
+ if ($tva_npr)
+ $info_bits |= 0x01;
- if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))
- {
- $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
- setEventMessages($mesg, null, 'errors');
- }
- else
- {
- // Insert line
- $result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit);
+ if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))
+ {
+ $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
+ setEventMessages($mesg, null, 'errors');
+ }
+ else
+ {
+ // Insert line
+ $result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit);
- if ($result > 0)
- {
- /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ if ($result > 0)
+ {
+ /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{
// Define output language
$outputlangs = $langs;
@@ -665,114 +665,114 @@ if (empty($reshook))
$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}*/
- $object->fetch($object->id); // Reload lines
+ $object->fetch($object->id); // Reload lines
- unset($_POST['prod_entry_mode']);
+ unset($_POST['prod_entry_mode']);
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['remise_percent']);
- unset($_POST['price_ht']);
- unset($_POST['multicurrency_price_ht']);
- unset($_POST['price_ttc']);
- unset($_POST['tva_tx']);
- unset($_POST['product_ref']);
- unset($_POST['product_label']);
- unset($_POST['product_desc']);
- unset($_POST['fournprice']);
- unset($_POST['buying_price']);
- unset($_POST['np_marginRate']);
- unset($_POST['np_markRate']);
- unset($_POST['dp_desc']);
- unset($_POST['idprod']);
- unset($_POST['units']);
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['remise_percent']);
+ unset($_POST['price_ht']);
+ unset($_POST['multicurrency_price_ht']);
+ unset($_POST['price_ttc']);
+ unset($_POST['tva_tx']);
+ unset($_POST['product_ref']);
+ unset($_POST['product_label']);
+ unset($_POST['product_desc']);
+ unset($_POST['fournprice']);
+ unset($_POST['buying_price']);
+ unset($_POST['np_marginRate']);
+ unset($_POST['np_markRate']);
+ unset($_POST['dp_desc']);
+ unset($_POST['idprod']);
+ unset($_POST['units']);
- unset($_POST['date_starthour']);
- unset($_POST['date_startmin']);
- unset($_POST['date_startsec']);
- unset($_POST['date_startday']);
- unset($_POST['date_startmonth']);
- unset($_POST['date_startyear']);
- unset($_POST['date_endhour']);
- unset($_POST['date_endmin']);
- unset($_POST['date_endsec']);
- unset($_POST['date_endday']);
- unset($_POST['date_endmonth']);
- unset($_POST['date_endyear']);
+ unset($_POST['date_starthour']);
+ unset($_POST['date_startmin']);
+ unset($_POST['date_startsec']);
+ unset($_POST['date_startday']);
+ unset($_POST['date_startmonth']);
+ unset($_POST['date_startyear']);
+ unset($_POST['date_endhour']);
+ unset($_POST['date_endmin']);
+ unset($_POST['date_endsec']);
+ unset($_POST['date_endday']);
+ unset($_POST['date_endmonth']);
+ unset($_POST['date_endyear']);
- unset($_POST['situations']);
- unset($_POST['progress']);
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- }
+ unset($_POST['situations']);
+ unset($_POST['progress']);
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
- $action = '';
- }
- }
- }
+ $action = '';
+ }
+ }
+ }
- elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
- {
- if (! $object->fetch($id) > 0) dol_print_error($db);
- $object->fetch_thirdparty();
+ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
+ {
+ if (! $object->fetch($id) > 0) dol_print_error($db);
+ $object->fetch_thirdparty();
- // Clean parameters
- $date_start = '';
- $date_end = '';
- //$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'));
- $description = dol_htmlcleanlastbr(GETPOST('product_desc','none') ? GETPOST('product_desc','none') : GETPOST('desc','none'));
- $pu_ht = GETPOST('price_ht');
- $vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
- $qty = GETPOST('qty');
+ // Clean parameters
+ $date_start = '';
+ $date_end = '';
+ //$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'));
+ $description = dol_htmlcleanlastbr(GETPOST('product_desc','none') ? GETPOST('product_desc','none') : GETPOST('desc','none'));
+ $pu_ht = GETPOST('price_ht');
+ $vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+ $qty = GETPOST('qty');
- // Define info_bits
- $info_bits = 0;
- if (preg_match('/\*/', $vat_rate))
- $info_bits |= 0x01;
+ // Define info_bits
+ $info_bits = 0;
+ if (preg_match('/\*/', $vat_rate))
+ $info_bits |= 0x01;
- // Define vat_rate
- $vat_rate = str_replace('*', '', $vat_rate);
- $localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
- $localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
+ // Define vat_rate
+ $vat_rate = str_replace('*', '', $vat_rate);
+ $localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+ $localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
- // Add buying price
- $fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
- $buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
+ // Add buying price
+ $fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
+ $buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
- // Extrafields
- $extrafieldsline = new ExtraFields($db);
- $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
- $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+ // Extrafields
+ $extrafieldsline = new ExtraFields($db);
+ $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+ $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
- $objectline = new FactureLigneRec($db);
- if ($objectline->fetch(GETPOST('lineid')))
- {
- $objectline->array_options=$array_options;
- $result=$objectline->insertExtraFields();
- if ($result < 0)
- {
- setEventMessages($langs->trans('Error').$result, null, 'errors');
- }
- }
+ $objectline = new FactureLigneRec($db);
+ if ($objectline->fetch(GETPOST('lineid')))
+ {
+ $objectline->array_options=$array_options;
+ $result=$objectline->insertExtraFields();
+ if ($result < 0)
+ {
+ setEventMessages($langs->trans('Error').$result, null, 'errors');
+ }
+ }
- // Unset extrafield
- if (is_array($extralabelsline))
- {
- // Get extra fields
- foreach ($extralabelsline as $key => $value)
- {
- unset($_POST["options_" . $key]);
- }
- }
+ // Unset extrafield
+ if (is_array($extralabelsline))
+ {
+ // Get extra fields
+ foreach ($extralabelsline as $key => $value)
+ {
+ unset($_POST["options_" . $key]);
+ }
+ }
- // Define special_code for special lines
- $special_code=GETPOST('special_code');
- if (! GETPOST('qty')) $special_code=3;
+ // Define special_code for special lines
+ $special_code=GETPOST('special_code');
+ if (! GETPOST('qty')) $special_code=3;
- /*$line = new FactureLigne($db);
+ /*$line = new FactureLigne($db);
$line->fetch(GETPOST('lineid'));
$percent = $line->get_prev_progress($object->id);
@@ -784,69 +784,69 @@ if (empty($reshook))
$result = -1;
}*/
- // Check minimum price
- $productid = GETPOST('productid', 'int');
- if (! empty($productid))
- {
- $product = new Product($db);
- $product->fetch($productid);
+ // Check minimum price
+ $productid = GETPOST('productid', 'int');
+ if (! empty($productid))
+ {
+ $product = new Product($db);
+ $product->fetch($productid);
- $type = $product->type;
+ $type = $product->type;
- $price_min = $product->price_min;
- if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
- $price_min = $product->multiprices_min [$object->thirdparty->price_level];
+ $price_min = $product->price_min;
+ if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+ $price_min = $product->multiprices_min [$object->thirdparty->price_level];
- $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
+ $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
- // Check price is not lower than minimum (check is done only for standard or replacement invoices)
- if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
- setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
- $error ++;
- }
- } else {
- $type = GETPOST('type');
- $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+ // Check price is not lower than minimum (check is done only for standard or replacement invoices)
+ if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
+ setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
+ $error ++;
+ }
+ } else {
+ $type = GETPOST('type');
+ $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
- // Check parameters
- if (GETPOST('type') < 0) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
- $error ++;
- }
- }
- if ($qty < 0) {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
- $error ++;
- }
+ // Check parameters
+ if (GETPOST('type') < 0) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+ $error ++;
+ }
+ }
+ if ($qty < 0) {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+ $error ++;
+ }
- // Update line
- if (! $error)
- {
- $result = $object->updateline(
- GETPOST('lineid'),
- $description,
- $pu_ht,
- $qty,
- $vat_rate,
- $localtax1_rate,
- $localtax1_rate,
- GETPOST('productid'),
- GETPOST('remise_percent'),
- 'HT',
- $info_bits,
- 0,
- 0,
- $type,
- 0,
- $special_code,
- $label,
- GETPOST('units')
- );
+ // Update line
+ if (! $error)
+ {
+ $result = $object->updateline(
+ GETPOST('lineid'),
+ $description,
+ $pu_ht,
+ $qty,
+ $vat_rate,
+ $localtax1_rate,
+ $localtax1_rate,
+ GETPOST('productid'),
+ GETPOST('remise_percent'),
+ 'HT',
+ $info_bits,
+ 0,
+ 0,
+ $type,
+ 0,
+ $special_code,
+ $label,
+ GETPOST('units')
+ );
- if ($result >= 0)
- {
- /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+ if ($result >= 0)
+ {
+ /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
// Define output language
$outputlangs = $langs;
$newlang = '';
@@ -863,50 +863,50 @@ if (empty($reshook))
$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
}*/
- $object->fetch($object->id); // Reload lines
+ $object->fetch($object->id); // Reload lines
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['productid']);
- unset($_POST['remise_percent']);
- unset($_POST['price_ht']);
- unset($_POST['multicurrency_price_ht']);
- unset($_POST['price_ttc']);
- unset($_POST['tva_tx']);
- unset($_POST['product_ref']);
- unset($_POST['product_label']);
- unset($_POST['product_desc']);
- unset($_POST['fournprice']);
- unset($_POST['buying_price']);
- unset($_POST['np_marginRate']);
- unset($_POST['np_markRate']);
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['productid']);
+ unset($_POST['remise_percent']);
+ unset($_POST['price_ht']);
+ unset($_POST['multicurrency_price_ht']);
+ unset($_POST['price_ttc']);
+ unset($_POST['tva_tx']);
+ unset($_POST['product_ref']);
+ unset($_POST['product_label']);
+ unset($_POST['product_desc']);
+ unset($_POST['fournprice']);
+ unset($_POST['buying_price']);
+ unset($_POST['np_marginRate']);
+ unset($_POST['np_markRate']);
- unset($_POST['dp_desc']);
- unset($_POST['idprod']);
- unset($_POST['units']);
+ unset($_POST['dp_desc']);
+ unset($_POST['idprod']);
+ unset($_POST['units']);
- unset($_POST['date_starthour']);
- unset($_POST['date_startmin']);
- unset($_POST['date_startsec']);
- unset($_POST['date_startday']);
- unset($_POST['date_startmonth']);
- unset($_POST['date_startyear']);
- unset($_POST['date_endhour']);
- unset($_POST['date_endmin']);
- unset($_POST['date_endsec']);
- unset($_POST['date_endday']);
- unset($_POST['date_endmonth']);
- unset($_POST['date_endyear']);
+ unset($_POST['date_starthour']);
+ unset($_POST['date_startmin']);
+ unset($_POST['date_startsec']);
+ unset($_POST['date_startday']);
+ unset($_POST['date_startmonth']);
+ unset($_POST['date_startyear']);
+ unset($_POST['date_endhour']);
+ unset($_POST['date_endmin']);
+ unset($_POST['date_endsec']);
+ unset($_POST['date_endday']);
+ unset($_POST['date_endmonth']);
+ unset($_POST['date_endyear']);
- unset($_POST['situations']);
- unset($_POST['progress']);
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
- }
+ unset($_POST['situations']);
+ unset($_POST['progress']);
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+ }
}
@@ -987,7 +987,7 @@ if ($action == 'create')
$htmltext = '
'.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
@@ -998,20 +998,20 @@ if ($action == 'create')
print '';
print '
';
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
- print $doleditor->Create(1);
+ print $doleditor->Create(1);
// Private note
if (empty($user->societe_id))
{
- print ' ';
- print '';
- print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
- print ' ';
- print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
- print $doleditor->Create(1);
- // print '
- print ' ';
+ print '
';
+ print '';
+ print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
+ print ' ';
+ print '';
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ print $doleditor->Create(1);
+ // print '
+ print ' ';
}
// Author
@@ -1083,7 +1083,7 @@ if ($action == 'create')
print "";
- dol_fiche_end();
+ dol_fiche_end();
$title = $langs->trans("ProductsAndServices");
@@ -1102,10 +1102,10 @@ if ($action == 'create')
// Show object lines
if (! empty($object->lines))
{
- $disableedit=1;
- $disablemove=1;
- $disableremove=1;
- $ret = $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
+ $disableedit=1;
+ $disablemove=1;
+ $disableremove=1;
+ $ret = $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
}
print "\n";
@@ -1125,9 +1125,9 @@ if ($action == 'create')
print "\n";
print '
';
+ print ' ';
+ print '
';
+ print '
';
print "\n";
}
else
@@ -1171,53 +1171,53 @@ else
if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
else $morehtmlref.= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
- $morehtmlref.='
';
- dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+ dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
- print '