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

Merge pull request #1935 from FHenry/3.6_fix

Browse Source 
3.6 fix -  	Fix trad currency -  Return error message on category creation failure
This commit is contained in:
Laurent Destailleur 2014-10-03 02:42:32 +02:00
commit ae303f34a4
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -23,6 +23,8 @@ For users:
- Fix: Withdrawal total amount is double
- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
- Fix: Web service categorie WDSL declaration is correct
- Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined
- Fix: Category creation failed and no message output
***** ChangeLog for 3.6 compared to 3.5.* *****
For users:

2
htdocs/categories/fiche.php
View File

@ -143,6 +143,8 @@ if ($action == 'add' && $user->rights->categorie->creer)
{
$action = 'confirmed';
$_POST["addcat"] = '';
} else {
setEventMessage($object->error,'errors');
}
}
}

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

@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$langs->load("bills");
$langs->load("products");
$langs->load("main");
$id=GETPOST('id','int');
$ref=GETPOST('ref','alpha');
@ -292,13 +293,17 @@ if ($id > 0 || ! empty($ref))
{
// Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
if ($object->price_base_type == 'TTC')
{
print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
}
else
{
print price($object->price).' '.$langs->trans($object->price_base_type);
print price($object->price);
if (!empty($object->price_base_type)) {
print ' '.$langs->trans($object->price_base_type);
}
}
print '</td></tr>';
@ -310,7 +315,10 @@ if ($id > 0 || ! empty($ref))
}
else
{
print price($object->price_min).' '.$langs->trans($object->price_base_type);
print price($object->price_min);
if (!empty($object->price_base_type)) {
print ' '.$langs->trans($object->price_base_type);
}
}
print '</td></tr>';
}