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

Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-09 16:14:19 +02:00
commit 9bb539843f
11 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/propal/stats/index.php
View File

@ -53,7 +53,8 @@ $endyear=$year;
$form=new Form($db); $form=new Form($db);
$langs->load("propal"); $langs->load('propal');
$langs->load('other');
llxHeader(); llxHeader();

3
htdocs/commande/stats/index.php
View File

@ -51,7 +51,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear;
$startyear=$year-1; $startyear=$year-1;
$endyear=$year; $endyear=$year;
$langs->load("orders"); $langs->load('orders');
$langs->load('other');
/* /*

4
htdocs/compta/facture/fiche-rec.php
View File

@ -65,7 +65,7 @@ if ($action == 'add')
{ {
if (! GETPOST('titre')) if (! GETPOST('titre'))
{ {
setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors'); setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }
@ -138,7 +138,7 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Title // Title
print '<tr><td>'.$langs->trans("Title").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td>';
print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">'; print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">';
print '</td>'; print '</td>';

5
htdocs/compta/facture/stats/index.php
View File

@ -54,8 +54,9 @@ $endyear=$year;
* View * View
*/ */
$langs->load("bills"); $langs->load('bills');
$langs->load("companies"); $langs->load('companies');
$langs->load('other');
$form=new Form($db); $form=new Form($db);

18
htdocs/core/class/html.form.class.php
View File

@ -701,13 +701,13 @@ class Form
$selected_input_value=$product->ref; $selected_input_value=$product->ref;
} }
======= =======
if ($selected && empty($selected_input_value)) if ($selected && empty($selected_input_value))
{ {
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$product = new Product($this->db); $product = new Product($this->db);
$product->fetch($selected); $product->fetch($selected);
$selected_input_value=$product->ref; $selected_input_value=$product->ref;
} }
>>>>>>> refs/remotes/origin/3.3 >>>>>>> refs/remotes/origin/3.3
// mode=1 means customers products // mode=1 means customers products
$ajaxoptions=array(); $ajaxoptions=array();
@ -1657,8 +1657,8 @@ class Form
{ {
$opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity; $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity;
$outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity; $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity;
$opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding $opt.= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
$outval.=$langs->transnoentities("Units"); $outval.= ' '.$langs->transnoentities("Units");
} }
if ($objp->quantity >= 1) if ($objp->quantity >= 1)

1
htdocs/ecm/docmine.php
View File

@ -132,6 +132,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
} }
else else
{ {
$langs->load('errors');
setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors'); setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors');
} }
} }

2
htdocs/fourn/commande/fiche.php
View File

@ -1109,7 +1109,7 @@ elseif (! empty($object->id))
//'text' => $langs->trans("ConfirmClone"), //'text' => $langs->trans("ConfirmClone"),
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
//array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)) array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
); );
} }

12
htdocs/langs/es_ES/products.lang
View File

@ -84,14 +84,14 @@ ShowService=Mostrar servicio
ProductsAndServicesArea=Área productos y servicios ProductsAndServicesArea=Área productos y servicios
ProductsArea=Área Productos ProductsArea=Área Productos
ServicesArea=Área Servicios ServicesArea=Área Servicios
AddToMyProposals=Adjuntar a mis presupuestos AddToMyProposals=Añadir a mis presupuestos
AddToOtherProposals=Adjuntar a otros presupuestos AddToOtherProposals=Añadir a otros presupuestos
AddToMyBills=Adjuntar a mis facturas AddToMyBills=Añadir a mis facturas
AddToOtherBills=Adjuntar a otras facturas AddToOtherBills=Añadir a otras facturas
CorrectStock=Corregir stock CorrectStock=Corregir stock
AddPhoto=Adjuntar una foto AddPhoto=Adjuntar una foto
ListOfStockMovements=Listado de movimientos de stock ListOfStockMovements=Listado de movimientos de stock
NoPhotoYet=No hay fotografía disponible por el momento NoPhotoYet=No hay fotografías disponibles por el momento
BuyingPrice=Precio de compra BuyingPrice=Precio de compra
SupplierCard=Ficha proveedor SupplierCard=Ficha proveedor
CommercialCard=Ficha comercial CommercialCard=Ficha comercial
@ -114,6 +114,8 @@ AssociatedProductsAbility=Activar productos compuestos
AssociatedProducts=Productos compuestos AssociatedProducts=Productos compuestos
AssociatedProductsNumber=Nº de productos que componen este producto AssociatedProductsNumber=Nº de productos que componen este producto
ParentProductsNumber=Nº de productos que este producto compone ParentProductsNumber=Nº de productos que este producto compone
IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto virtual
IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo utilizado por ningún producto virtual
EditAssociate=Componer EditAssociate=Componer
Translation=Traducción Translation=Traducción
KeywordFilter=Filtro por clave KeywordFilter=Filtro por clave

1
htdocs/product/composition/fiche.php
View File

@ -72,7 +72,6 @@ $cancel <> $langs->trans("Cancel") &&
$error=0; $error=0;
for($i=0;$i<$_POST["max_prod"];$i++) for($i=0;$i<$_POST["max_prod"];$i++)
{ {
print "<br> : ".$_POST["prod_id_chk".$i];
if ($_POST["prod_id_chk".$i] > 0) if ($_POST["prod_id_chk".$i] > 0)
{ {
if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0) if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)

2
htdocs/product/fiche.php
View File

@ -1417,7 +1417,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
$langs->load("bills"); $langs->load("bills");
$html .= '<tr class="liste_titre">'; $html .= '<tr class="liste_titre">';
$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherOrders").'</td>'; $html .= '<td class="liste_titre">'.$langs->trans("AddToOtherBills").'</td>';
$html .= '</tr><tr>'; $html .= '</tr><tr>';
$html .= '<td valign="top">'; $html .= '<td valign="top">';

6
test/phpunit/NumberingModulesTest.php
View File

@ -212,9 +212,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2) $this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
// Try an offset when an invoice already exists // Try an offset when an invoice already exists
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
$result=$numbering->getNextValue($mysoc, $localobject2); $result=$numbering->getNextValue($mysoc, $localobject2);
// Now we try with a different fiscal month (forced by mask) // Now we try with a different fiscal month (forced by mask)
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';