mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-21 16:23:20 +01:00
add phpcs rule extension (#36561)
* add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * add phpcs rule extension * test * test * test * test * test * test * fix * fix * fix * fix * fix * fix * fix translations * fix translations * translate * translate * translate * translate * translate * translate * translate * Update propal.class.php
This commit is contained in:
Frédéric FRANCE
@@ -84,7 +84,7 @@ class Commande extends CommonOrder
|
||||
public $fk_element = 'fk_commande';
|
||||
|
||||
/**
|
||||
* @var string String with name of icon for commande class. Here is object_order.png
|
||||
* @var string String with name of icon for order class. Here is object_order.png
|
||||
*/
|
||||
public $picto = 'order';
|
||||
|
||||
@@ -1585,10 +1585,9 @@ class Commande extends CommonOrder
|
||||
*
|
||||
* @see add_product()
|
||||
*
|
||||
* Les parameters sont deja cense etre juste et avec valeurs finales a l'appel
|
||||
* de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
|
||||
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
|
||||
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
|
||||
* The parameters are already supposed to be correct and with final values upon calling this method.
|
||||
* Also, for the VAT rate, it must have already been defined by the caller using the method get_default_tva(societe_vendeuse, societe_acheteuse, produit)
|
||||
* and the description (desc) must already have the correct value (it's up to the caller to manage multilanguage)
|
||||
*/
|
||||
public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = array(), $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '', $noupdateafterinsertline = 0)
|
||||
{
|
||||
@@ -1707,10 +1706,9 @@ class Commande extends CommonOrder
|
||||
}
|
||||
}
|
||||
}
|
||||
// Calcul du total TTC et de la TVA pour la ligne a partir de
|
||||
// qty, pu, remise_percent et txtva
|
||||
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
|
||||
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
|
||||
// Calculation of the gross total (TTC) and VAT for the line from qty, pu, remise_percent and txtva
|
||||
// VERY IMPORTANT: It's at the time of line insertion that we must store the net, VAT, and gross amounts,
|
||||
// and this is done at the line level, which has its own VAT rate
|
||||
|
||||
$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
|
||||
|
||||
@@ -2163,7 +2161,7 @@ class Commande extends CommonOrder
|
||||
$line->tva_tx = $remise->tva_tx;
|
||||
$line->subprice = -(float) $remise->amount_ht;
|
||||
$line->price = -(float) $remise->amount_ht;
|
||||
$line->fk_product = 0; // Id produit predefini
|
||||
$line->fk_product = 0; // Predefined Product ID
|
||||
$line->qty = 1;
|
||||
$line->remise_percent = 0;
|
||||
$line->rang = -1;
|
||||
@@ -2287,7 +2285,7 @@ class Commande extends CommonOrder
|
||||
$line->product_custom_country_id = $objp->country_id;
|
||||
$line->product_custom_country_code = $objp->country_code;
|
||||
|
||||
$line->fk_product_type = $objp->fk_product_type; // Produit ou service
|
||||
$line->fk_product_type = $objp->fk_product_type; // Product or service
|
||||
$line->fk_unit = $objp->fk_unit;
|
||||
|
||||
$line->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array();
|
||||
@@ -2688,7 +2686,7 @@ class Commande extends CommonOrder
|
||||
/**
|
||||
* Set the planned delivery date
|
||||
*
|
||||
* @param User $user Object utilisateur qui modifie
|
||||
* @param User $user Object User who makes the update
|
||||
* @param int $delivery_date Delivery date
|
||||
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
|
||||
* @return int Return integer <0 si ko, >0 si ok
|
||||
@@ -3185,10 +3183,9 @@ class Commande extends CommonOrder
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
// Calcul du total TTC et de la TVA pour la ligne a partir de
|
||||
// qty, pu, remise_percent et txtva
|
||||
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
|
||||
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
|
||||
// Calculation of the gross total (TTC) and VAT for the line from qty, pu, remise_percent and txtva
|
||||
// VERY IMPORTANT: It's at the time of line insertion that we must store the net, VAT, and gross amounts,
|
||||
// and this is done at the line level, which has its own VAT rate
|
||||
|
||||
$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user