';
$obj=new IText();
+ $obj->size=50;
$r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'
';
- $r.=_('Autre information : ').$obj->input('other_info').'
';
+ $r.=_('Communication').$obj->input('other_info').'
';
$r.='
';
$r.='';
return $r;
diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php
index 6a6a7b265..5ba62f1c4 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -1282,14 +1282,16 @@ EOF;
$r.='';
+ $r = '
';
// check for upload piece
$file = new IFile();
$file->table = 0;
$file->setAlertOnSize(true);
- $r.='
';
+ $r.='
'._("Facture").'
';
// add a receipt
$r.=_("Ajoutez une pièce justificative ");
$r.=$file->input("pj", "");
@@ -1398,11 +1400,15 @@ EOF;
" union select -2,'"._("Z - Facture PDF Standard")."' ".
" order by 2");
$r.=$doc_gen->input() . '
';
+ $r.='
'._("Documents supplémentaires").'
';
+ // add a receipt
$r.=$this->input_supplemental_document();
- $r.='
';
$obj = new IText();
+ $obj->size=50;
+ $r.='
';
$r.=_('Numero de bon de commande') . $obj->input('bon_comm') . '
';
+
$r.=_('Communication') . $obj->input('other_info') . '
';
$r.='
';
$r.='
';
diff --git a/include/class/invoice_pdf.class.php b/include/class/invoice_pdf.class.php
index 3dffd3c04..9a7615999 100644
--- a/include/class/invoice_pdf.class.php
+++ b/include/class/invoice_pdf.class.php
@@ -263,22 +263,25 @@ class Invoice_PDF extends \PDF
}
$this->write_multi($col['quantity'], 4, nbm($this->data['e_quant' . $i]), '', 'R',fill:$fill);
$this->write_multi($col['price'], 4, nbm($this->data['e_march' . $i . '_price']), '', 'R',fill:$fill);
- $this->write_multi($col['vat_code'], 4, $this->data['e_march' . $i . '_tva_id'], '', 'C',fill:$fill);
- $x = $this->data['e_march' . $i . '_tva_id'];
- if (!isset($a_tva_amount[$x]))
+ if (isset ($this->data['e_march' . $i . '_tva_id']))
{
- $a_tva_amount[$x] = 0;
+ $this->write_multi($col['vat_code'], 4, $this->data['e_march' . $i . '_tva_id'], '', 'C',fill:$fill);
+ $x = $this->data['e_march' . $i . '_tva_id'];
+ if (!isset($a_tva_amount[$x]))
+ {
+ $a_tva_amount[$x] = 0;
+ }
+ $a_tva_amount[$x] = bcadd($a_tva_amount[$x], $this->data["e_march" . $i . "_tva_amount"], 2);
+ $tot_vat = bcadd($tot_vat
+ , $this->data['e_march' . $i . '_tva_amount']
+ , 2);
}
- $a_tva_amount[$x] = bcadd($a_tva_amount[$x], $this->data["e_march" . $i . "_tva_amount"], 2);
$tot_amount = bcadd($tot_amount
, bcmul($this->data['e_march' . $i . '_price']
, $this->data['e_quant' . $i]
, 2
)
, 2);
- $tot_vat = bcadd($tot_vat
- , $this->data['e_march' . $i . '_tva_amount']
- , 2);
$this->line_new(4);
if ($this->GetY()>250) {
$this->AddPage();
diff --git a/include/class/tva_rate_mtable.class.php b/include/class/tva_rate_mtable.class.php
index 01fdc2d4f..0f9f3f15f 100644
--- a/include/class/tva_rate_mtable.class.php
+++ b/include/class/tva_rate_mtable.class.php
@@ -97,6 +97,7 @@ class Tva_Rate_MTable extends Manage_Table_SQL
'tva_peppol_code'=>_("Code TVA est utilisé pour les factures électroniques, plus d'information dans le manuel"),
'vx_code'=>_("Code exemption pour facture PEPPOL (ubl)")
);
+ $this->setTitle(_("Détail TVA"));
}
/**
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index b052e04c8..024052918 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -158,6 +158,10 @@ if ( isset($_POST['record']) )
$Ledger=new Acc_Ledger_Sale($cn,$post_jrn);
try {
$internal=$Ledger->insert($_POST);
+
+ /* Save the additional information into jrn_info */
+ $obj=new Acc_Ledger_Info($cn);
+ $obj->save_extra($Ledger->jr_id,$_POST);
$Ledger->upload_supplemental_document($Ledger->jr_id);
// var $receipt (string) contains the name of the file name of
// the invoice (document created), if empty there
@@ -290,9 +294,6 @@ if ( isset($_POST['record']) )
}
- /* Save the additional information into jrn_info */
- $obj=new Acc_Ledger_Info($cn);
- $obj->save_extra($Ledger->jr_id,$_POST);
/* save followup */
$Ledger->save_followup($http->request("action_gestion","string",""));
diff --git a/include/constant.php b/include/constant.php
index 85c67c639..6c7b4da38 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -28,7 +28,7 @@ global $version_noalyss;
define('NOALYSS_VERSION', 10000 );
// Database schema version
-define("DBVERSION", 206);
+define("DBVERSION", 207);
// version for MONO_DATABASE
define("MONO_DATABASE", 25);
diff --git a/include/lib/pdf_core.class.php b/include/lib/pdf_core.class.php
index 3c95170ae..5950079a7 100644
--- a/include/lib/pdf_core.class.php
+++ b/include/lib/pdf_core.class.php
@@ -210,7 +210,7 @@ class PDF_Core extends TFPDF
* @see TFPDF::SetFontSize()
* @return void
*/
- protected function print_row()
+ function print_row()
{
static $e=0;
$e++;
diff --git a/include/sql/patch/upgrade206.sql b/include/sql/patch/upgrade206.sql
new file mode 100644
index 000000000..76a9a3256
--- /dev/null
+++ b/include/sql/patch/upgrade206.sql
@@ -0,0 +1,45 @@
+begin;
+
+CREATE OR REPLACE FUNCTION guess_country_code()
+ RETURNS void
+ AS
+$$
+declare
+ country_code char(2);
+ x record;
+begin
+ for x in
+ select
+ f1.jft_id
+ ,f1.f_id
+ ,( select f2.ad_value from fiche_detail f2 where f2.f_id=f1.f_id and ad_id= 13) as tva_num
+ ,( select f3.ad_value from fiche_detail f3 where f3.f_id=f1.f_id and ad_id= 16) as country
+ from
+ fiche_detail f1
+ where
+ f1.ad_id=57
+ and coalesce(f1.ad_value,'')=''
+ loop
+ country_code='';
+ case
+ when substr(x.tva_num,1,2) = 'FR' or upper(x.country)='FRANCE' then country_code='FR';
+ when substr(x.tva_num,1,2) = 'BE' or upper(x.country)='BELGIQUE' then country_code='BE';
+ when substr(x.tva_num,1,2) = 'LU' or upper(x.country)='LUXEMBOURG' then country_code='LU';
+ when substr(x.tva_num,1,2) <> '' then country_code=upper(substr(x.tva_num,1,2));
+ else
+ country_code='';
+ end case;
+ raise notice 'tva_num % country % country_code % jft_id %s',x.tva_num,x.country,country_code,x.jft_id;
+ if country_code <> '' then
+ update fiche_detail set ad_value=country_code where jft_id=x.jft_id;
+ end if;
+ end loop;
+end;
+$$
+LANGUAGE plpgsql;
+
+
+select guess_country_code();
+
+insert into version (val,v_description) values (207,'Guess country code ');
+commit;
\ No newline at end of file
diff --git a/include/widget/invoice/invoice-display.php b/include/widget/invoice/invoice-display.php
index 6870ef6a2..6a38b2f4b 100644
--- a/include/widget/invoice/invoice-display.php
+++ b/include/widget/invoice/invoice-display.php
@@ -49,7 +49,7 @@ foreach ($array as $item):