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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-19 11:16:43 +01:00
commit eeab635c8e
15 changed files with 107 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -74,9 +74,11 @@ class AccountingAccount extends CommonObject
public $rowid;
/**
* @var string Creation date
* Date creation record (datec)
*
* @var integer
*/
public $datec;
public $datec;
/**
* @var string pcg version

16
htdocs/adherents/class/adherent.class.php
View File

@ -176,8 +176,20 @@ class Adherent extends CommonObject
public $photo;
public $datec;
public $datem;
/**
* Date creation record (datec)
*
* @var integer
*/
public $datec;
/**
* Date modification record (tms)
*
* @var integer
*/
public $datem;
public $datevalid;
public $gender;

31
htdocs/adherents/class/subscription.class.php
View File

@ -47,10 +47,33 @@ class Subscription extends CommonObject
*/
public $picto='payment';
public $datec; // Date creation
public $datem; // Date modification
public $dateh; // Subscription start date (date subscription)
public $datef; // Subscription end date
/**
* Date creation record (datec)
*
* @var integer
*/
public $datec;
/**
* Date modification record (tms)
*
* @var integer
*/
public $datem;
/**
* Subscription start date (date subscription)
*
* @var integer
*/
public $dateh;
/**
* Subscription end date
*
* @var integer
*/
public $datef;
/**
* @var int ID

18
htdocs/cashdesk/class/Facturation.class.php
View File

@ -21,7 +21,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
/**
* Class ot manage invoices for pos module (cashdesk)
* Class to manage invoices for pos module (cashdesk)
*/
class Facturation
{
@ -84,7 +84,7 @@ class Facturation
}
// Methodes de traitement des donnees
// Data processing methods
/**
@ -124,14 +124,14 @@ class Facturation
// Define part of HT, VAT, TTC
$resultarray=calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
// Calcul du total ht sans remise
// Calculation of total HT without discount
$total_ht = $resultarray[0];
$total_vat = $resultarray[1];
$total_ttc = $resultarray[2];
$total_localtax1 = $resultarray[9];
$total_localtax2 = $resultarray[10];
// Calcul du montant de la remise
// Calculation of the discount amount
if ($this->remisePercent())
{
$remise_percent = $this->remisePercent();
@ -201,7 +201,7 @@ class Facturation
}
/**
* Calcul du total HT, total TTC et montants TVA
* Calculation of total HT, total TTC and VAT amounts
*
* @return int Total
*/
@ -240,7 +240,7 @@ class Facturation
}
/**
* Reinitialisation des attributs
* Reset attributes
*
* @return void
*/
@ -257,7 +257,7 @@ class Facturation
}
/**
* Reinitialisation des attributs persistants
* Resetting persistent attributes
*
* @return void
*/
@ -275,7 +275,7 @@ class Facturation
}
// Methodes de modification des attributs proteges
// Methods for modifying protected attributes
/**
* Getter for id
@ -560,7 +560,7 @@ class Facturation
}
/**
* Get totla HT
* Get total HT
*
* @param int $aTotalHt Total amount
* @return int Total amount

34
htdocs/comm/action/class/actioncomm.class.php
View File

@ -87,9 +87,20 @@ class ActionComm extends CommonObject
* @var string Agenda event label
*/
public $label;
public $datec; // Date creation record (datec)
public $datem; // Date modification record (tms)
/**
* Date creation record (datec)
*
* @var integer
*/
public $datec;
/**
* Date modification record (tms)
*
* @var integer
*/
public $datem;
/**
* Object user that create action
@ -118,9 +129,20 @@ class ActionComm extends CommonObject
* @var int
*/
public $usermodid;
public $datep; // Date action start (datep)
public $datef; // Date action end (datep2)
/**
* Date action start (datep)
*
* @var integer
*/
public $datep;
/**
* Date action end (datep2)
*
* @var integer
*/
public $datep2;
/**
* @var int -1=Unkown duration

2
htdocs/comm/propal/class/propal.class.php
View File

@ -411,7 +411,7 @@ class Propal extends CommonObject
* @param float $txtva Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
* @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside)
* @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside)
* @param int $fk_product Id du produit/service predefini
* @param int $fk_product Product/Service ID predefined
* @param float $remise_percent Pourcentage de remise de la ligne
* @param string $price_base_type HT or TTC
* @param float $pu_ttc Prix unitaire TTC

2
htdocs/commande/class/commande.class.php
View File

@ -1281,7 +1281,7 @@ class Commande extends CommonOrder
* @param float $txlocaltax1 Local tax 1 rate (deprecated, use instead txtva with code inside)
* @param float $txlocaltax2 Local tax 2 rate (deprecated, use instead txtva with code inside)
* @param int $fk_product Id of product
* @param float $remise_percent Pourcentage de remise de la ligne
* @param float $remise_percent Percentage discount of the line
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise
* @param string $price_base_type HT or TTC

8
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -681,8 +681,8 @@ class FactureRec extends CommonInvoice
* @param double $txtva Taux de tva force, sinon -1
* @param double $txlocaltax1 Local tax 1 rate (deprecated)
* @param double $txlocaltax2 Local tax 2 rate (deprecated)
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $fk_product Product/Service ID predefined
* @param double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC
* @param int $info_bits VAT npr or not ?
* @param int $fk_remise_except Id remise
@ -862,8 +862,8 @@ class FactureRec extends CommonInvoice
* @param double $txtva Taux de tva force, sinon -1
* @param double $txlocaltax1 Local tax 1 rate (deprecated)
* @param double $txlocaltax2 Local tax 2 rate (deprecated)
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $fk_product Product/Service ID predefined
* @param double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC
* @param int $info_bits Bits de type de lignes
* @param int $fk_remise_except Id remise

6
htdocs/compta/facture/class/facture.class.php
View File

@ -2865,9 +2865,9 @@ class Facture extends CommonInvoice
* @param string $desc Description of line
* @param double $pu Prix unitaire (HT ou TTC selon price_base_type) (> 0 even for credit note lines)
* @param double $qty Quantity
* @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 $remise_percent Percentage discount of the line
* @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 (Can be '8.5', '8.5 (ABC)')
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate

4
htdocs/contrat/class/contrat.class.php
View File

@ -1345,7 +1345,7 @@ class Contrat extends CommonObject
* @param float $txlocaltax1 Local tax 1 rate
* @param float $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id produit
* @param float $remise_percent Pourcentage de remise de la ligne
* @param float $remise_percent Percentage discount of the line
* @param int $date_start Date de debut prevue
* @param int $date_end Date de fin prevue
* @param string $price_base_type HT or TTC
@ -1552,7 +1552,7 @@ class Contrat extends CommonObject
* @param string $desc Description de la ligne
* @param float $pu Prix unitaire
* @param int $qty Quantite
* @param float $remise_percent Pourcentage de remise de la ligne
* @param float $remise_percent Percentage discount of the line
* @param int $date_start Date de debut prevue
* @param int $date_end Date de fin prevue
* @param float $tvatx Taux TVA

2
htdocs/core/lib/parsemd.lib.php
View File

@ -84,4 +84,4 @@ function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null
//}
return $content;
}
}

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

@ -1540,8 +1540,8 @@ class FactureFournisseur extends CommonInvoice
* @param double $txlocaltax1 LocalTax1 Rate
* @param double $txlocaltax2 LocalTax2 Rate
* @param double $qty Quantite
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $fk_product Product/Service ID predefined
* @param double $remise_percent Percentage discount of the line
* @param date $date_start Date de debut de validite du service
* @param date $date_end Date de fin de validite du service
* @param string $ventil Code de ventilation comptable
@ -1794,7 +1794,7 @@ class FactureFournisseur extends CommonInvoice
* @param double $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations of line
* @param int $type Type of line (0=product, 1=service)
* @param double $remise_percent Pourcentage de remise de la ligne
* @param double $remise_percent Percentage discount of the line
* @param int $notrigger Disable triggers
* @param timestamp $date_start Date start of service
* @param timestamp $date_end Date end of service

2
htdocs/modulebuilder/index.php
View File

@ -1100,7 +1100,7 @@ print load_fiche_titre($text, '', 'title_setup');
print $langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'<br>';
$dirsrootforscan=array($dirread);
if ($dirread != DOL_DOCUMENT_ROOT && ! empty($conf->global->MAIN_FEATURES_LEVEL >=2)) { $dirsrootforscan[]=DOL_DOCUMENT_ROOT; }
if ($dirread != DOL_DOCUMENT_ROOT && $conf->global->MAIN_FEATURES_LEVEL >=2) { $dirsrootforscan[]=DOL_DOCUMENT_ROOT; }
// Search modules to edit
$listofmodules=array();

28
htdocs/product/card.php
View File

@ -1024,14 +1024,10 @@ else
// Duration
if ($type == 1)
{
print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="' . $duration_value . '"> &nbsp;';
print '<input name="duration_unit" type="radio" value="i">'.$langs->trans("Minute").'&nbsp;';
print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';
print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';
print '</td></tr>';
print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
print '<input name="surface" size="4" value="'.GETPOST('duration_value').'">';
print $formproduct->select_measuring_units("duration_unit", "time");
print '</td></tr>';
}
if ($type != 1) // Nature, Weight and volume only applies to products and not to services
@ -1404,19 +1400,9 @@ else
if ($object->isService())
{
// Duration
print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="i"'.($object->duration_unit=='i'?' checked':'').'>'.$langs->trans("Minute");
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
print '&nbsp; ';
print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
print '<input name="surface" size="5" value="'.$object->duration_value.'"> ';
print $formproduct->select_measuring_units("duration_unit", "time", $object->duration_unit);
print '</td></tr>';
}
else

4
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -373,8 +373,8 @@ class SupplierProposal extends CommonObject
* @param double $txtva Taux de tva
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param int $fk_product Id du produit/service predefini
* @param double $remise_percent Pourcentage de remise de la ligne
* @param int $fk_product Product/Service ID predefined
* @param double $remise_percent Percentage discount of the line
* @param string $price_base_type HT or TTC
* @param double $pu_ttc Prix unitaire TTC
* @param int $info_bits Bits de type de lignes