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

Merge branch 'KreizIT-predefined' into develop

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2014-09-22 23:57:12 +02:00
commit 4ff6b1ab1a
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -74,9 +74,9 @@ For users:
- Fix: [ bug #1506, #1507 ] ECM trigger error problem - Fix: [ bug #1506, #1507 ] ECM trigger error problem
- Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
- Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
- New: Direct invoice creation from predefined invoice
- New: Add dunning into accountancy report - New: Add dunning into accountancy report
For users, new experimental module:
New experimental module:
- New: Module Accounting Expert to manage accountancy - New: Module Accounting Expert to manage accountancy
Special Thanks to developpers : Special Thanks to developpers :
Olivier Geffroy Olivier Geffroy
@ -125,7 +125,8 @@ Dolibarr better:
- Table llx_c_pays were renamed into llx_c_country. - Table llx_c_pays were renamed into llx_c_country.
- Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after - Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after
creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead. creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead.
- A lot of pages called fiche.php were renamed into card.php
- A lot of pages called liste.php were renamed into list.php
***** ChangeLog for 3.6.1 compared to 3.6.* ***** ***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users: For users:

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

@ -522,9 +522,14 @@ else
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->statut == 0 && $user->rights->facture->creer)
{
echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
}
if ($object->statut == 0 && $user->rights->facture->supprimer) if ($object->statut == 0 && $user->rights->facture->supprimer)
{ {
print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a>'; print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
} }
print '</div>'; print '</div>';
@ -584,23 +589,18 @@ else
print '<td align="right">'.price($objp->total).'</td>'."\n"; print '<td align="right">'.price($objp->total).'</td>'."\n";
if (! $objp->paye) echo '<td align="center">';
if ($user->rights->facture->creer)
{ {
if ($objp->fk_statut == 0) echo '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
{ echo $langs->trans("CreateBill"),'</a>';
print '<td align="right">'.$langs->trans("Draft").'</td>';
}
else
{
print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?filtre=paye:0,fk_statut:1">'.$langs->trans("Validated").'</a></td>';
}
} }
else else
{ {
print '<td>&nbsp;</td>'; echo "&nbsp;";
} }
echo "</td></tr>\n";
print "</tr>\n";
$i++; $i++;
} }
} }