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

Merge pull request #1851 from grandoc/3.6

Browse Source 
fix : missing translation
This commit is contained in:
Laurent Destailleur 2014-08-28 11:53:00 +02:00
commit 14ec2cd1d9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2013 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2010-2014 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr> * Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
@ -192,6 +192,13 @@ class CommandeFournisseur extends CommonOrder
$this->db->free($resql); $this->db->free($resql);
// Retreive all extrafield
// fetch optionals attributes and labels
require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
$extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels);
if ($this->statut == 0) $this->brouillon = 1; if ($this->statut == 0) $this->brouillon = 1;

3
htdocs/langs/en_US/products.lang
View File

@ -80,11 +80,12 @@ ContractStatusClosed=Closed
ContractStatusRunning=Running ContractStatusRunning=Running
ContractStatusExpired=expired ContractStatusExpired=expired
ContractStatusOnHold=Not running ContractStatusOnHold=Not running
ContractStatusToRun=A mettre en service ContractStatusToRun=To get running
ContractNotRunning=This contract is not running ContractNotRunning=This contract is not running
ErrorProductAlreadyExists=A product with reference %s already exists. ErrorProductAlreadyExists=A product with reference %s already exists.
ErrorProductBadRefOrLabel=Wrong value for reference or label. ErrorProductBadRefOrLabel=Wrong value for reference or label.
ErrorProductClone=There was a problem while trying to clone the product or service. ErrorProductClone=There was a problem while trying to clone the product or service.
ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
Suppliers=Suppliers Suppliers=Suppliers
SupplierRef=Supplier's product ref. SupplierRef=Supplier's product ref.
ShowProduct=Show product ShowProduct=Show product

2
htdocs/product/class/product.class.php
View File

@ -1213,7 +1213,7 @@ class Product extends CommonObject
if ($newvat == '') $newvat=$this->tva_tx; if ($newvat == '') $newvat=$this->tva_tx;
if (! empty($newminprice) && ($newminprice > $newprice)) if (! empty($newminprice) && ($newminprice > $newprice))
{ {
$this->error='ErrorPricCanBeLowerThanMinPrice'; $this->error='ErrorPriceCantBeLowerThanMinPrice';
return -1; return -1;
} }