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

New: Some changes to support the type of line in entities.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-10 00:54:53 +00:00
parent 8a12e715dd
commit 681a787fea
11 changed files with 92 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/comm/propal.php
View File

@ -873,7 +873,7 @@ if ($_GET['action'] == 'down' && $user->rights->propale->creer)
/* /*
* Affichage page * View
*/ */
llxHeader('',$langs->trans('Proposal'),'Proposition'); llxHeader('',$langs->trans('Proposal'),'Proposition');
@ -1235,6 +1235,9 @@ if ($id > 0 || ! empty($ref))
$sql = 'SELECT pt.rowid, pt.description, pt.fk_product, pt.fk_remise_except,'; $sql = 'SELECT pt.rowid, pt.description, pt.fk_product, pt.fk_remise_except,';
$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,'; $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
$sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.marge_tx, pt.marque_tx, pt.pa_ht, pt.special_code,'; $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.marge_tx, pt.marque_tx, pt.pa_ht, pt.special_code,';
$sql.= ' '.$db->pdate('pt.date_start').' as date_start,';
$sql.= ' '.$db->pdate('pt.date_end').' as date_end,';
$sql.= ' pt.product_type,';
$sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid,'; $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid,';
$sql.= ' p.description as product_desc'; $sql.= ' p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt'; $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
@ -1269,6 +1272,13 @@ if ($id > 0 || ! empty($ref))
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
// Show product and description
$type=$objp->product_type?$objp->product_type:$objp->fk_product_type;
// Try to enhance type detection using date_start and date_end for free lines where type
// was not saved.
if (! empty($objp->date_start)) $type=1;
if (! empty($objp->date_end)) $type=1;
// Ligne en mode visu // Ligne en mode visu
if ($_GET['action'] != 'editline' || $_GET['lineid'] != $objp->rowid) if ($_GET['action'] != 'editline' || $_GET['lineid'] != $objp->rowid)
{ {
@ -1562,7 +1572,7 @@ if ($id > 0 || ! empty($ref))
} }
/* /*
* Ajouter une ligne * Form to add new line
*/ */
if ($propal->statut == 0 && $user->rights->propale->creer && $_GET["action"] <> 'editline') if ($propal->statut == 0 && $user->rights->propale->creer && $_GET["action"] <> 'editline')
{ {
@ -1570,7 +1580,7 @@ if ($id > 0 || ! empty($ref))
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td '.$colspan.'>'; print '<td '.$colspan.'>';
print '<a name="add"></a>'; // ancre print '<a name="add"></a>'; // ancre
print $langs->trans('Description').'</td>'; print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>'; print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>'; print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>'; print '<td align="right">'.$langs->trans('Qty').'</td>';
@ -1578,16 +1588,18 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="4">&nbsp;</td>'; print '<td colspan="4">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
// Ajout produit produits/services personnalises // Add free products/services form
print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#add" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#add" method="post">';
print '<input type="hidden" name="propalid" value="'.$propal->id.'">'; print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
print '<input type="hidden" name="action" value="addligne">'; print '<input type="hidden" name="action" value="addligne">';
$var=true; $var=true;
print '<tr '.$bc[$var].">\n"; print '<tr '.$bc[$var].">\n";
print '<td '.$colspan.'>'; print '<td '.$colspan.'>';
// editeur wysiwyg
print $html->select_type_of_lines(-1,'type',1).'<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -1599,15 +1611,11 @@ if ($id > 0 || ! empty($ref))
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>'; print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
} }
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="right">';
if($societe->tva_assuj == "0") //if ($societe->tva_assuj == "0")
{ //print '<input type="hidden" name="np_tva_tx" value="0">0';
print '<input type="hidden" name="np_tva_tx" value="0">0'; //else
} $html->select_tva('np_tva_tx', $conf->defaulttx, $mysoc, $societe);
else
{
$html->select_tva('np_tva_tx', $conf->defaulttx, $mysoc, $societe);
}
print "</td>\n"; print "</td>\n";
print '<td align="right"><input type="text" size="5" name="np_price"></td>'; print '<td align="right"><input type="text" size="5" name="np_price"></td>';
print '<td align="right"><input type="text" size="2" value="1" name="qty"></td>'; print '<td align="right"><input type="text" size="2" value="1" name="qty"></td>';
@ -1618,7 +1626,7 @@ if ($id > 0 || ! empty($ref))
print '</form>'; print '</form>';
// Ajout de produits/services predefinis // Ajout de produits/services predefinis
if ($conf->produit->enabled) if ($conf->produit->enabled || $conf->service->enabled)
{ {
if ($conf->global->PRODUIT_USE_MARKUP) if ($conf->global->PRODUIT_USE_MARKUP)
{ {
@ -1630,6 +1638,7 @@ if ($id > 0 || ! empty($ref))
} }
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td '.$colspan.'>'; print '<td '.$colspan.'>';
print $langs->trans("AddNewLine").' - ';
if ($conf->service->enabled) if ($conf->service->enabled)
{ {
print $langs->trans('RecordedProductsAndServices'); print $langs->trans('RecordedProductsAndServices');
@ -1662,7 +1671,7 @@ if ($id > 0 || ! empty($ref))
} }
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>'; if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
// editeur wysiwyg // Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");

24
htdocs/commande/fiche.php
View File

@ -1665,14 +1665,14 @@ else
} }
/* /*
* Ajouter une ligne * Form to add new line
*/ */
if ($commande->statut == 0 && $user->rights->commande->creer && $_GET["action"] <> 'editline') if ($commande->statut == 0 && $user->rights->commande->creer && $_GET["action"] <> 'editline')
{ {
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td>';
print '<a name="add"></a>'; // ancre print '<a name="add"></a>'; // ancre
print $langs->trans('Description').'</td>'; print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>'; print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>'; print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>'; print '<td align="right">'.$langs->trans('Qty').'</td>';
@ -1680,7 +1680,7 @@ else
print '<td colspan="4">&nbsp;</td>'; print '<td colspan="4">&nbsp;</td>';
print '</tr>'; print '</tr>';
// Ajout produit produits/services personnalises // Add free products/services form
print '<form action="fiche.php?id='.$id.'#add" method="post">'; print '<form action="fiche.php?id='.$id.'#add" method="post">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print '<input type="hidden" name="action" value="addligne">'; print '<input type="hidden" name="action" value="addligne">';
@ -1688,7 +1688,10 @@ else
$var=true; $var=true;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'; print '<td>';
// editeur wysiwyg
print $html->select_type_of_lines(-1,'type',1).'<br>';
// Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -1700,10 +1703,10 @@ else
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>'; print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
} }
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="right">';
if($soc->tva_assuj == "0") //if($soc->tva_assuj == "0")
print '<input type="hidden" name="tva_tx" value="0">0'; //print '<input type="hidden" name="tva_tx" value="0">0';
else //else
print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc); print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
print '</td>'; print '</td>';
print '<td align="right"><input type="text" name="pu" size="5"></td>'; print '<td align="right"><input type="text" name="pu" size="5"></td>';
@ -1727,10 +1730,11 @@ else
print '</form>'; print '</form>';
// Ajout de produits/services predefinis // Ajout de produits/services predefinis
if ($conf->produit->enabled) if ($conf->produit->enabled || $conf->service->enabled)
{ {
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'; print '<td colspan="3">';
print $langs->trans("AddNewLine").' - ';
if ($conf->service->enabled) if ($conf->service->enabled)
{ {
print $langs->trans('RecordedProductsAndServices'); print $langs->trans('RecordedProductsAndServices');
@ -1764,7 +1768,7 @@ else
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>'; if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
// editeur wysiwyg // Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");

17
htdocs/compta/facture.php
View File

@ -2977,10 +2977,11 @@ else
*/ */
if ($fac->statut == 0 && $user->rights->facture->creer && $_GET['action'] <> 'valid' && $_GET['action'] <> 'editline') if ($fac->statut == 0 && $user->rights->facture->creer && $_GET['action'] <> 'valid' && $_GET['action'] <> 'editline')
{ {
// Free zone form
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td>';
print '<a name="add"></a>'; // ancre print '<a name="add"></a>'; // ancre
print $langs->trans('AddNewLine').'</td>'; print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>'; print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUHT').'</td>'; print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>'; print '<td align="right">'.$langs->trans('Qty').'</td>';
@ -2997,9 +2998,9 @@ else
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'; print '<td>';
print $html->select_type_of_lines(-1,'type',1); print $html->select_type_of_lines(-1,'type',1).'<br>';
// Editeur wysiwyg // Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -3012,6 +3013,9 @@ else
} }
print '</td>'; print '</td>';
print '<td align="right">'; print '<td align="right">';
//if($soc->tva_assuj == "0")
//print '<input type="hidden" name="tva_tx" value="0">0';
//else
$html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc); $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
print '</td>'; print '</td>';
print '<td align="right"><input type="text" name="pu" size="6"></td>'; print '<td align="right"><input type="text" name="pu" size="6"></td>';
@ -3031,8 +3035,9 @@ else
} }
print '</form>'; print '</form>';
// Add predefined services/products form
if ($conf->produit->enabled) // Predefined services/products form
if ($conf->produit->enabled || $conf->service->enabled)
{ {
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'; print '<td colspan="3">';
@ -3070,7 +3075,7 @@ else
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>'; if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
// éditeur wysiwyg // Editor wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");

38
htdocs/facture.class.php
View File

@ -127,7 +127,7 @@ class Facture extends CommonObject
/** /**
* \brief Create invoice in database * \brief Create invoice in database
* \param user Object uset that create * \param user Object user that create
* \param notrigger 1 ne declenche pas les triggers, 0 sinon * \param notrigger 1 ne declenche pas les triggers, 0 sinon
* \return int <0 si ko, >0 si ok * \return int <0 si ko, >0 si ok
*/ */
@ -243,23 +243,17 @@ class Facture extends CommonObject
} }
/* /*
* Insertion du detail des produits dans la base, * Insert lines of invoices in database
* si tableau products défini.
*/ */
for ($i = 0 ; $i < sizeof($this->products) ; $i++) for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{ {
$result = $this->addline( $newinvoiceline=new FactureLigne($this->db);
$this->id, $newinvoiceline=$this->lignes[$i];
$this->products[$i]->desc, $newinvoiceline->fk_facture=$this->id;
$this->products[$i]->subprice, if ($result >= 0 && ($newinvoiceline->info_bits & 0x01) == 0) // We keep only lines with first bit = 0
$this->products[$i]->qty, {
$this->products[$i]->tva_tx, $result=$newinvoiceline->insert();
$this->products[$i]->fk_product, }
$this->products[$i]->remise_percent,
$this->products[$i]->date_start,
$this->products[$i]->date_end
);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
@ -362,6 +356,7 @@ class Facture extends CommonObject
$facture->amount = $this->amount; $facture->amount = $this->amount;
$facture->remise_absolue = $this->remise_absolue; $facture->remise_absolue = $this->remise_absolue;
$facture->remise_percent = $this->remise_percent; $facture->remise_percent = $this->remise_percent;
$facture->lignes = $this->lignes; // Tableau des lignes de factures $facture->lignes = $this->lignes; // Tableau des lignes de factures
$facture->products = $this->lignes; // Tant que products encore utilisé $facture->products = $this->lignes; // Tant que products encore utilisé
@ -608,12 +603,12 @@ class Facture extends CommonObject
/** /**
\brief Recupére les lignes de factures dans this->lignes * \brief Recupére les lignes de factures dans this->lignes
\return int 1 si ok, < 0 si erreur * \return int 1 si ok, < 0 si erreur
*/ */
function fetch_lines() function fetch_lines()
{ {
$sql = 'SELECT l.rowid, l.fk_product, l.description, l.price, l.qty, l.tva_taux, '; $sql = 'SELECT l.rowid, l.fk_product, l.description, l.product_type, l.price, l.qty, l.tva_taux, ';
$sql.= ' l.remise, l.remise_percent, l.fk_remise_except, l.subprice,'; $sql.= ' l.remise, l.remise_percent, l.fk_remise_except, l.subprice,';
$sql.= ' '.$this->db->pdate('l.date_start').' as date_start,'.$this->db->pdate('l.date_end').' as date_end,'; $sql.= ' '.$this->db->pdate('l.date_start').' as date_start,'.$this->db->pdate('l.date_end').' as date_end,';
$sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_ttc, l.fk_code_ventilation, l.fk_export_compta,'; $sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_ttc, l.fk_code_ventilation, l.fk_export_compta,';
@ -638,7 +633,7 @@ class Facture extends CommonObject
$faclig->desc = $objp->description; // Description ligne $faclig->desc = $objp->description; // Description ligne
$faclig->libelle = $objp->label; // Label produit $faclig->libelle = $objp->label; // Label produit
$faclig->product_desc = $objp->product_desc; // Description produit $faclig->product_desc = $objp->product_desc; // Description produit
$faclig->product_type = $objp->fk_product_type; $faclig->product_type = $objp->product_type; // Type of line
$faclig->qty = $objp->qty; $faclig->qty = $objp->qty;
$faclig->subprice = $objp->subprice; $faclig->subprice = $objp->subprice;
$faclig->tva_tx = $objp->tva_taux; $faclig->tva_tx = $objp->tva_taux;
@ -646,6 +641,7 @@ class Facture extends CommonObject
$faclig->fk_remise_except = $objp->fk_remise_except; $faclig->fk_remise_except = $objp->fk_remise_except;
$faclig->produit_id = $objp->fk_product; $faclig->produit_id = $objp->fk_product;
$faclig->fk_product = $objp->fk_product; $faclig->fk_product = $objp->fk_product;
$faclig->fk_product_type = $objp->fk_product_type;
$faclig->date_start = $objp->date_start; $faclig->date_start = $objp->date_start;
$faclig->date_end = $objp->date_end; $faclig->date_end = $objp->date_end;
$faclig->date_start = $objp->date_start; $faclig->date_start = $objp->date_start;

1
htdocs/langs/en_US/main.lang
View File

@ -501,6 +501,7 @@ Informations=Informations
Page=Page Page=Page
Notes=Notes Notes=Notes
AddNewLine=Add new line AddNewLine=Add new line
FreeZone=Free text
# Week day # Week day
Day1=Monday Day1=Monday
Day2=Tuesday Day2=Tuesday

1
htdocs/langs/fr_FR/main.lang
View File

@ -500,6 +500,7 @@ Informations=Informations
Page=Page Page=Page
Notes=Notes Notes=Notes
AddNewLine=Ajout nouvelle ligne AddNewLine=Ajout nouvelle ligne
FreeZone=Zone libre
# Week day # Week day
Day1=Lundi Day1=Lundi
Day2=Mardi Day2=Mardi

9
mysql/migration/2.5.0-2.6.0.sql
View File

@ -86,6 +86,15 @@ drop table llx_don_projet;
alter table llx_facture_fourn_det add column date_start datetime DEFAULT NULL; alter table llx_facture_fourn_det add column date_start datetime DEFAULT NULL;
alter table llx_facture_fourn_det add column date_end datetime DEFAULT NULL; alter table llx_facture_fourn_det add column date_end datetime DEFAULT NULL;
alter table llx_commandedet add column product_type integer DEFAULT 0 after total_ttc;
alter table llx_propaldet add column product_type integer DEFAULT 0 after total_ttc;
alter table llx_propaldet add column date_start datetime DEFAULT NULL after product_type;
alter table llx_propaldet add column date_end datetime DEFAULT NULL after date_start;
alter table llx_commande_fournisseur add column product_type integer DEFAULT 0 after total_ttc;
alter table llx_commande_fournisseur add column date_start datetime DEFAULT NULL after product_type;
alter table llx_commande_fournisseur add column date_end datetime DEFAULT NULL after date_start;
-- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet); -- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet);
-- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); -- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);

7
mysql/tables/llx_commande_fournisseurdet.sql
View File

@ -1,6 +1,6 @@
-- =================================================================== -- ===================================================================
-- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- --
-- This program is free software; you can redistribute it and/or modify -- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by -- it under the terms of the GNU General Public License as published by
@ -35,5 +35,8 @@ create table llx_commande_fournisseurdet
total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale
total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale
total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale
product_type integer DEFAULT 0,
date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0 -- TVA NPR ou non info_bits integer DEFAULT 0 -- TVA NPR ou non
)type=innodb; )type=innodb;

1
mysql/tables/llx_commandedet.sql
View File

@ -35,6 +35,7 @@ create table llx_commandedet
total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale
total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale
total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale
product_type integer DEFAULT 0,
date_start datetime DEFAULT NULL, -- date debut si service date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non info_bits integer DEFAULT 0, -- TVA NPR ou non

1
mysql/tables/llx_facture_fourn_det.sql
View File

@ -1,5 +1,6 @@
-- =================================================================== -- ===================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
-- --
-- This program is free software; you can redistribute it and/or modify -- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by -- it under the terms of the GNU General Public License as published by

7
mysql/tables/llx_propaldet.sql
View File

@ -26,7 +26,7 @@ create table llx_propaldet
description text, description text,
fk_remise_except integer NULL, -- Lien vers table des remises fixes fk_remise_except integer NULL, -- Lien vers table des remises fixes
tva_tx double(6,3) DEFAULT 0, -- taux tva tva_tx double(6,3) DEFAULT 0, -- taux tva
qty real, -- quantité qty real, -- quantity
remise_percent real DEFAULT 0, -- pourcentage de remise remise_percent real DEFAULT 0, -- pourcentage de remise
remise real DEFAULT 0, -- montant de la remise (obsolete) remise real DEFAULT 0, -- montant de la remise (obsolete)
price real, -- prix final (obsolete) price real, -- prix final (obsolete)
@ -34,10 +34,15 @@ create table llx_propaldet
total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantité et incluant remise ligne et globale
total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantité et incluant remise ligne et globale
total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantité et incluant remise ligne et globale
product_type integer DEFAULT 0,
date_start datetime DEFAULT NULL, -- date debut si service
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non info_bits integer DEFAULT 0, -- TVA NPR ou non
pa_ht double(24,8) DEFAULT 0, -- prix d'achat HT pa_ht double(24,8) DEFAULT 0, -- prix d'achat HT
marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat) marge_tx double(6,3) DEFAULT 0, -- taux de marge (marge sur prix d'achat)
marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente) marque_tx double(6,3) DEFAULT 0, -- taux de marque (marge sur prix de vente)
special_code tinyint(4) UNSIGNED DEFAULT 0, -- code pour les lignes speciales special_code tinyint(4) UNSIGNED DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0 -- ordre affichage sur la propal rang integer DEFAULT 0 -- ordre affichage sur la propal
)type=innodb; )type=innodb;