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

Merge pull request #3951 from frederic34/fccard

Browse Source 
add messages
This commit is contained in:
Laurent Destailleur 2015-11-11 18:32:30 +01:00
commit 9ee06e8f0d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/commande/card.php
View File

@ -156,8 +156,7 @@ if (empty($reshook))
$result = $object->set_reopen($user);
if ($result > 0)
{
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
setEventMessages($langs->trans('OrderReopened', $object->ref), null);
}
else
{
@ -529,16 +528,25 @@ if (empty($reshook))
elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
{
$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
// bank account
else if ($action == 'setbankaccount' && $user->rights->commande->creer) {
$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
// shipping method
else if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
else if ($action == 'setremisepercent' && $user->rights->commande->creer) {

2
htdocs/core/class/commonobject.class.php
View File

@ -2866,6 +2866,7 @@ abstract class CommonObject
}
else
{
$this->errors[] = $this->db->lasterror();
return false;
}
}
@ -2903,6 +2904,7 @@ abstract class CommonObject
}
else
{
$this->errors[] = $this->db->lasterror();
return -1;
}
}

1
htdocs/langs/en_US/orders.lang
View File

@ -70,6 +70,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
OrderReopened= Order %s Reopened
AddOrder=Create order
AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders