diff --git a/doc/manuel-fr.sgml b/doc/manuel-fr.sgml
index 974981c43..c781fe25e 100644
--- a/doc/manuel-fr.sgml
+++ b/doc/manuel-fr.sgml
@@ -1770,8 +1770,10 @@ vous 
 <item> CUST_NAME customer's name </item>
 <item> CUST_ADDR_1 customer's address line 1</item>
 <item> CUST_CP customer's ZIP code</item>
+<item> CUST_CITY customer's city </item>
 <item> CUST_CO customer's country</item>
 <item> CUST_VAT customer's VAT</item>
+<item> DATE_LIMIT Echéeance </item>
 <item> MARCH_NEXT end this item and increment the counter $i </item>
 <item> VEN_ART_NAME Nom de l'article</item>
 <item> VEN_ART_PRICE Prix de l'article</item>
@@ -1784,6 +1786,7 @@ vous 
 <item> VEN_TVA le total de la tva de l'article</item>
 <item> TOTAL_VEN_HTVA le total HTVA</item>
 <item> TOTAL_VEN_TVAC le total TVAC</item>
+<item> TOTAL_TVA le total TVA</item>
 <item> TVA_LABEL Montre le % de tva</item>
 <item> TVA_AMOUNT Tva de l'article</item>
 <item> REFERENCE Référence</item>
diff --git a/include/class_document.php b/include/class_document.php
index 1b33dae95..63d2b56db 100644
--- a/include/class_document.php
+++ b/include/class_document.php
@@ -441,9 +441,11 @@ class Document
  *  - [CUST_ADDR_1] customer's address line 1
  *  - [CUST_CP] customer's ZIP code
  *  - [CUST_CO] customer's country
+ *  - [CUST_CITY] customer's city
  *  - [CUST_COUNTRY]
  *  - [CUST_VAT] customer's VAT
  *  - [MARCH_NEXT]   end this item and increment the counter $i
+ *  - [DATE_LIMIT] 
  *  - [VEN_ART_NAME]
  *  - [VEN_ART_PRICE]
  *  - [VEN_ART_QUANT]
@@ -554,6 +556,14 @@ class Document
 	  $r=$tiers->strAttribut(ATTR_DEF_CP);
 
 	  break;
+	case 'CUST_CITY':
+	  $tiers=new fiche($this->db);
+	  $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client'];
+	  $tiers->getByQcode($qcode,false);
+	  $r=$tiers->strAttribut(ATTR_DEF_CITY);
+
+	  break;
+
 	case 'CUST_CO':
 	  $tiers=new fiche($this->db);
 	  $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client'];
@@ -574,6 +584,8 @@ class Document
 	case 'NUMBER':
 	  $r=$this->d_number;
 	  break;
+
+
 	case 'REFERENCE':
 	  $act=new action($this->db);
 	  $act->ag_id=$this->ag_id;
@@ -592,7 +604,15 @@ class Document
 	   *  - [VEN_TVAC]
 	   *  - [VEN_TVA]
 	   *  - [TOTAL_VEN_HTVA]
+	   *  - [DATE_LIMIT]
 	   */
+	case 'DATE_LIMIT':
+	  extract ($_POST);
+	  $id='e_ech' ;
+	  if ( !isset (${$id}) ) return "";
+	  $r=${$id};
+	  break;
+
 	case 'MARCH_NEXT':
 	  $counter++;
 	  $r='';
@@ -737,6 +757,8 @@ class Document
 		   ${$qt}==0 || ${$sell}==0)
 		continue;
 	      $sum+=${$sell}*${$qt};
+	      $sum=round($sum,2);
+
 	      echo_debug('class_document',__LINE__,'sum :'.$sum);
 
 	    }
@@ -755,10 +777,28 @@ class Document
 	      echo_debug('class_document',__LINE__,'sell :'.$sell.' qt = '.$qt);
 
 	      $sum+=$sell*$qt*(1+$tva_rate);
-	      //	      $sum+=${'e_march'.$i.'_sell'}*${'e_quant'.$i}*(1+$tva_rate);
+	      $sum=round($sum,2);
 	    }
 	  $r=round($sum,2);
 
+	  break;
+	case 'TOTAL_TVA':
+	  extract($_POST);
+	  $sum=0.0;
+	  for ($i=0;$i<$nb_item;$i++)
+	    {
+	      $tva=GetTvaRate($this->db,${'e_march'.$i.'_tva_id'});
+	      $tva_rate=( $tva == null || $tva == 0 )?0.0:$tva['tva_rate'];
+	      echo_debug('class_document',__LINE__,' :'.$i.' sur '.$nb_item);
+	      $sell=${'e_march'.$i.'_sell'};
+	      $qt=${'e_quant'.$i};
+	      echo_debug('class_document',__LINE__,'sell :'.$sell.' qt = '.$qt);
+
+	      $sum+=$sell*$qt*$tva_rate;
+	      $sum=round($sum,2);
+	    }
+	  $r=$sum;
+
 	  break;
 
 	}
diff --git a/include/constant.php b/include/constant.php
index ef204d722..d7b672457 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -132,6 +132,7 @@ define ("ATTR_DEF_PAYS",16);
 define ("ATTR_DEF_STOCK",19);
 define ("ATTR_DEF_TEL",17);
 define ("ATTR_DEF_EMAIL",18);
+define ("ATTR_DEF_CITY",24);
 define ("ATTR_DEF_COMPANY",25);
 define ("ATTR_DEF_FAX",26);