Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ajout de la tva sur les lignes dans l'admin des devis/facture #1360

Merged
merged 1 commit into from
Nov 26, 2023
Merged

ajout de la tva sur les lignes dans l'admin des devis/facture #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions db/migrations/20231121201113_tva_devis_facture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

use Phinx\Migration\AbstractMigration;

class TvaDevisFacture extends AbstractMigration
{
public function change()
{
$sql = <<<EOF
ALTER TABLE `afup_compta_facture_details`
ADD `tva` double(11,2) DEFAULT 0 AFTER `pu`;
EOF;
$this->execute($sql);
}
}
11 changes: 8 additions & 3 deletions htdocs/pages/administration/compta_devis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
$champs['designation'.$i] = $row['designation'];
$champs['quantite'.$i] = $row['quantite'];
$champs['pu'.$i] = $row['pu'];
$champs['tva'.$i] = $row['tva'];
$i++;
}

Expand Down Expand Up @@ -183,9 +184,11 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
$formulaire->addElement('static' , 'note' , '' , 'Ligne '.$i.'<br /><br />');
$formulaire->addElement('hidden' , 'id'.$i , 'id' );
$formulaire->addElement('text' , 'ref'.$i , 'Référence' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('static' , 'note' , '' , 'Rappel : sponsoring 20%, place supplémentaire 10%.<br />');
$formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , array('0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%'));
$formulaire->addElement('textarea', 'designation'.$i , 'Désignation', array('cols' => 42, 'rows' => 5));
$formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , array('size' => 50, 'maxlength' => 100));
}


Expand Down Expand Up @@ -236,7 +239,8 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
$valeur['ref'.$i],
$valeur['designation'.$i],
$valeur['quantite'.$i],
$valeur['pu'.$i]
$valeur['pu'.$i],
$valeur['tva'.$i]
);
}
} else {
Expand Down Expand Up @@ -270,7 +274,8 @@ function prepareDefaultsFromComptaFacId(Facture $comptaFact, $id) {
$valeur['ref'.$i],
$valeur['designation'.$i],
$valeur['quantite'.$i],
$valeur['pu'.$i]
$valeur['pu'.$i],
$valeur['tva'.$i]
);
}

Expand Down
7 changes: 5 additions & 2 deletions htdocs/pages/administration/compta_facture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@
$champs['designation'.$i] = $row['designation'];
$champs['quantite'.$i] = $row['quantite'];
$champs['pu'.$i] = $row['pu'];
$i++;
$champs['tva'.$i] = $row['tva'];
$i++;
}


Expand Down Expand Up @@ -183,9 +184,11 @@
$formulaire->addElement('static' , 'note' , '' , 'Ligne '.$i.'<br /><br />');
$formulaire->addElement('hidden' , 'id'.$i , 'id' );
$formulaire->addElement('text' , 'ref'.$i , 'Référence' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('static' , 'note' , '' , 'Rappel : sponsoring 20%, place supplémentaire 10%.<br />');
$formulaire->addElement('select' , 'tva' . $i , 'Taux de TVA' , array('0' => 'Non soumis', '5.50' => '5.5%', '10.00' => '10%', '20.00' => '20%'));
$formulaire->addElement('textarea', 'designation'.$i , 'Désignation', array('cols' => 42, 'rows' => 5));
$formulaire->addElement('text' , 'quantite'.$i , 'Quantite' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire' , array('size' => 50, 'maxlength' => 100));
$formulaire->addElement('text' , 'pu'.$i , 'Prix Unitaire HT' , array('size' => 50, 'maxlength' => 100));
}


Expand Down
13 changes: 8 additions & 5 deletions sources/Afup/Comptabilite/Facture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,19 @@ function ajouter($date_devis, $societe, $service, $adresse, $code_postal, $ville
return $this->_bdd->executer($requete);
}

function ajouter_details($ref, $designation, $quantite, $pu)
function ajouter_details($ref, $designation, $quantite, $pu, $tva = 0)
{
$requete = 'INSERT INTO ';
$requete .= 'afup_compta_facture_details (';
$requete .= 'idafup_compta_facture,ref,designation,quantite,pu) ';
$requete .= 'idafup_compta_facture,ref,designation,quantite,pu,tva) ';
$requete .= 'VALUES (';
$requete .= $this->obtenirDernier() . ',';
$requete .= $this->_bdd->echapper($ref) . ',';
$requete .= $this->_bdd->echapper($designation) . ',';
$requete .= $this->_bdd->echapper($quantite) . ',';
$requete .= $this->_bdd->echapper($pu) . ' ';
$requete .= $this->_bdd->echapper($pu) . ',';
$requete .= $this->_bdd->echapper($tva) . ' ';

$requete .= ');';

return $this->_bdd->executer($requete);
Expand Down Expand Up @@ -233,15 +235,16 @@ function modifier($id, $date_devis, $societe, $service, $adresse, $code_postal,
return $this->_bdd->executer($requete);
}

function modifier_details($id, $ref, $designation, $quantite, $pu)
function modifier_details($id, $ref, $designation, $quantite, $pu, $tva = 0)
{
$requete = 'UPDATE ';
$requete .= 'afup_compta_facture_details ';
$requete .= 'SET ';
$requete .= 'ref=' . $this->_bdd->echapper($ref) . ',';
$requete .= 'designation=' . $this->_bdd->echapper($designation) . ',';
$requete .= 'quantite=' . $this->_bdd->echapper($quantite) . ',';
$requete .= 'pu=' . $this->_bdd->echapper($pu) . ' ';
$requete .= 'pu=' . $this->_bdd->echapper($pu) . ',';
$requete .= 'tva=' . $this->_bdd->echapper($tva) . ' ';
$requete .= 'WHERE ';
$requete .= 'id=' . $id . ' ';

Expand Down