';
- print '| ';
+ print ' | ';
+ print '| ';
print $langs->trans('RetainedWarranty');
print ' | ';
if ($action != 'editretainedwarranty' && $user->rights->facture->creer){
@@ -3953,7 +4033,7 @@ else if ($id > 0 || ! empty($ref))
print '';
if ($action == 'editretainedwarranty')
{
- print ' | ';
-
- // Retained Warranty payment date limit
- print '';
- print '| ';
- print $langs->trans('RetainedWarrantyDateLimit');
+ // Retained warranty payment term
+ print ' | | ';
+ print '';
@@ -3983,21 +4062,66 @@ else if ($id > 0 || ! empty($ref))
$defaultDate = $object->date;
}
- if ($action == 'editretainedwarrantydatelimit')
+ if ($action == 'editretainedwarrantypaymentterms')
{
//date('Y-m-d',$object->date_lim_reglement)
print '';
}
else
{
- print dol_print_date($defaultDate);
+ print $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+ if(!$displayWarranty){
+ print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): ''));
+ }
}
print ' | ';
+
+
+
+
+ if($displayWarranty)
+ {
+ // Retained Warranty payment date limit
+ print '| ';
+ print '';
+ print ' | ';
+ $defaultDate = !empty($object->retained_warranty_date_limit)?$object->retained_warranty_date_limit:strtotime('-1 years', $object->date_lim_reglement);
+ if($object->date > $defaultDate){
+ $defaultDate = $object->date;
+ }
+
+ if ($action == 'editretainedwarrantydatelimit')
+ {
+ //date('Y-m-d',$object->date_lim_reglement)
+ print '';
+ }
+ else
+ {
+ print dol_print_date($object->retained_warranty_date_limit, 'day');
+ }
+ print ' | ';
+ }
+
}
@@ -4442,16 +4566,17 @@ else if ($id > 0 || ! empty($ref))
// Billed
print '| ' . $langs->trans("Billed") . ' : | ' . price($object->total_ttc) . ' | | ';
- if(!empty($object->retained_warranty)){
+ // Retained warranty : usualy use on construction industry
+ if(!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty){
// Billed - retained warranty
$retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
- print '| ' . $langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement)) . ' : | ' . price($billedWithRetainedWarranty) . ' | | ';
+ print '| ' . $langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')) . ' : | ' . price($billedWithRetainedWarranty) . ' | | ';
// retained warranty
print '| ';
print $langs->trans("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
- print !empty($object->retained_warranty_date_limit)?' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit)):'';
+ print !empty($object->retained_warranty_date_limit)?' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
print ' : | ' . price($retainedWarranty) . ' | | ';
}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 9c387f6630a..e108b526576 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -165,6 +165,8 @@ class Facture extends CommonInvoice
public $retained_warranty;
public $retained_warranty_date_limit;
+
+ public $retained_warranty_fk_cond_reglement;
/**
* Standard invoice
@@ -345,8 +347,8 @@ class Facture extends CommonInvoice
$this->note_private=trim($this->note_private);
$this->note_private=dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
- $this->retained_warranty = floatval($this->retained_warranty);
+
$this->array_options=$_facrec->array_options;
//if (! $this->remise) $this->remise = 0;
@@ -356,6 +358,7 @@ class Facture extends CommonInvoice
$this->linked_objects = $_facrec->linkedObjectsIds;
$forceduedate = $this->calculate_date_lim_reglement();
+
// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
if ($_facrec->frequency > 0)
@@ -407,7 +410,7 @@ class Facture extends CommonInvoice
// Define due date if not already defined
$datelim=(empty($forceduedate)?$this->calculate_date_lim_reglement():$forceduedate);
-
+
// Insert into database
$socid = $this->socid;
@@ -435,6 +438,7 @@ class Facture extends CommonInvoice
$sql.= ", multicurrency_tx";
$sql.= ", retained_warranty";
$sql.= ", retained_warranty_date_limit";
+ $sql.= ", retained_warranty_fk_cond_reglement";
$sql.= ")";
$sql.= " VALUES (";
$sql.= "'(PROV)'";
@@ -468,10 +472,11 @@ class Facture extends CommonInvoice
$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql.= ", ".(double) $this->multicurrency_tx;
$sql.= ", ".(empty($this->retained_warranty)?"0":$this->db->escape($this->retained_warranty));
- $sql.= ", '".$this->db->idate($this->retained_warranty_date_limit)."'";
+ $sql.= ", ".(!empty($this->retained_warranty_date_limit)?"'".$this->db->idate($this->retained_warranty_date_limit)."'":'NULL');
+ $sql.= ", ".(int) $this->retained_warranty_fk_cond_reglement;
$sql.=")";
-
+
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1288,7 +1293,7 @@ class Facture extends CommonInvoice
$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
$sql.= ', f.fk_incoterms, f.location_incoterms';
$sql.= ", i.libelle as libelle_incoterms";
- $sql.= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit";
+ $sql.= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit, f.retained_warranty_fk_cond_reglement as retained_warranty_fk_cond_reglement";
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
@@ -1356,8 +1361,9 @@ class Facture extends CommonInvoice
$this->situation_cycle_ref = $obj->situation_cycle_ref;
$this->situation_counter = $obj->situation_counter;
$this->situation_final = $obj->situation_final;
- $this->retained_warranty = $obj->retained_warranty;
- $this->retained_warranty_date_limit = $this->db->jdate($obj->retained_warranty_date_limit);
+ $this->retained_warranty = $obj->retained_warranty;
+ $this->retained_warranty_date_limit = $this->db->jdate($obj->retained_warranty_date_limit);
+ $this->retained_warranty_fk_cond_reglement = $obj->retained_warranty_fk_cond_reglement;
$this->extraparams = (array) json_decode($obj->extraparams, true);
// Incoterms
@@ -1628,7 +1634,8 @@ class Facture extends CommonInvoice
$sql.= " situation_counter=".(empty($this->situation_counter)?"null":$this->db->escape($this->situation_counter)).",";
$sql.= " situation_final=".(empty($this->situation_counter)?"0":$this->db->escape($this->situation_counter)).",";
$sql.= " retained_warranty=".(empty($this->retained_warranty)?"0":$this->db->escape($this->retained_warranty)).",";
- $sql.= " retained_warranty_date_limit=".(strval($this->retained_warranty_date_limit)!='' ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'null');
+ $sql.= " retained_warranty_date_limit=".(strval($this->retained_warranty_date_limit)!='' ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'null').",";
+ $sql.= " retained_warranty_fk_cond_reglement=".(isset($this->retained_warranty_fk_cond_reglement)?intval($this->retained_warranty_fk_cond_reglement):"null");
$sql.= " WHERE rowid=".$this->id;
$this->db->begin();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5e528f6a1d0..37f61e01f32 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1906,6 +1906,43 @@ abstract class CommonObject
return -2;
}
}
+
+ /**
+ * Change the retained warranty payments terms
+ *
+ * @param int $id Id of new payment terms
+ * @return int >0 if OK, <0 if KO
+ */
+ function setRetainedWarrantyPaymentTerms($id)
+ {
+ dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');
+ if ($this->statut >= 0 || $this->element == 'societe')
+ {
+ $fieldname = 'retained_warranty_fk_cond_reglement';
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET '.$fieldname.' = '.$id;
+ $sql .= ' WHERE rowid='.$this->id;
+
+ if ($this->db->query($sql))
+ {
+ $this->retained_warranty_fk_cond_reglement = $id;
+ return 1;
+ }
+ else
+ {
+ dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
+ else
+ {
+ dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
+ $this->error='Status of the object is incompatible '.$this->statut;
+ return -2;
+ }
+ }
/**
* Define delivery address
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index fb7db220138..3eb266d3559 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -53,5 +53,6 @@ ALTER TABLE llx_payment_salary ADD COLUMN fk_projet integer DEFAULT NULL after a
ALTER TABLE llx_facture ADD COLUMN retained_warranty real DEFAULT NULL after situation_final;
ALTER TABLE llx_facture ADD COLUMN retained_warranty_date_limit date DEFAULT NULL after retained_warranty;
+ALTER TABLE llx_facture ADD COLUMN retained_warranty_fk_cond_reglement integer DEFAULT NULL after retained_warranty_date_limit;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index abdefedc944..f18ec0f521c 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -86,8 +86,9 @@ create table llx_facture
situation_counter smallint, -- situation counter
situation_final smallint, -- is the situation final ?
- retained_warranty real DEFAULT NULL, -- % of retained warranty
- retained_warranty_date_limit date DEFAULT NULL,
+ retained_warranty real DEFAULT NULL, -- % of retained warranty
+ retained_warranty_date_limit date DEFAULT NULL,
+ retained_warranty_fk_cond_reglement integer DEFAULT NULL, -- payment condition of retained warranty
import_key varchar(14),
extraparams varchar(255), -- for other parameters with json format
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index c547f385be0..c9f966b2e2a 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -552,3 +552,10 @@ AutoFillDateToShort=Set end date
MaxNumberOfGenerationReached=Max number of gen. reached
ToPayOn=To pay on %s
RetainedWarranty=Retained Warranty
+PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
+DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
+setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
+setretainedwarranty=Set retained warranty
+setretainedwarrantyDateLimit=Set retained warranty date limit
+RetainedWarrantyDateLimit=Retained warranty date limit
+RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
|
|
|