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

Merge branch 'develop' of https://github.com/mrsof/dolibarr into

Browse Source 
mrsof-develop

Conflicts:
	htdocs/comm/card.php
This commit is contained in:
Laurent Destailleur 2015-02-24 17:00:52 +01:00
commit 203ff13a62
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/card.php
View File

@ -143,10 +143,10 @@ if (empty($reshook))
} }
// update outstandng limit // update outstandng limit
if ($action == 'setOutstandingBill') if ($action == 'setoutstanding_limit')
{ {
$object->fetch($id); $object->fetch($id);
$object->outstanding_limit=GETPOST('OutstandingBill'); $object->outstanding_limit=GETPOST('setoutstanding_limit');
$result=$object->set_OutstandingBill($user); $result=$object->set_OutstandingBill($user);
if ($result < 0) setEventMessage($object->error,'errors'); if ($result < 0) setEventMessage($object->error,'errors');
} }
@ -393,9 +393,10 @@ if ($id > 0)
{ {
print '<tr>'; print '<tr>';
print '<td>'; print '<td>';
print $form->editfieldkey("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer); print $form->editfieldkey("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer);
print '</td><td colspan="3">'; print '</td><td colspan="3">';
print $form->editfieldval("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer,'amount',($object->outstanding_limit != '' ? price($object->outstanding_limit) : '')); $limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
// display amount and link to unpaid bill // display amount and link to unpaid bill
$outstandigBills = $object->get_OutstandingBill(); $outstandigBills = $object->get_OutstandingBill();
if ($outstandigBills != 0) if ($outstandigBills != 0)