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

Merge pull request #1301 from aspangaro/3.4

Browse Source 
Fix 3.4
This commit is contained in:
Laurent Destailleur 2013-11-15 05:00:20 -08:00
commit 4099038083
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,8 +2,10 @@
English Dolibarr ChangeLog English Dolibarr ChangeLog
-------------------------------------------------------------- --------------------------------------------------------------
***** ChangeLog for 3.4.2 compared to 3.4.1 ***** ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
Fix: field's problem into company's page (RIB)
Fix: Document cerfa doesn't contained firstname & lastname from donator
Fix: Bad rounding on margin calculations and display. Fix: Bad rounding on margin calculations and display.
Fix: Option drpo table into backup was broken. Fix: Option drop table into backup was broken.
Fix: [ bug #1105 ] Searching Boxes other search option Fix: [ bug #1105 ] Searching Boxes other search option

2
htdocs/compta/prelevement/bons.php
View File

@ -79,7 +79,7 @@ if ($result)
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("WithdrawalReceipt"),"bons.php","p.ref",'','','class="liste_titre"'); print_liste_field_titre($langs->trans("WithdrawalReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"'); print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"');
print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>'; print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
print '</tr>'; print '</tr>';

4
htdocs/compta/prelevement/factures.php
View File

@ -47,7 +47,7 @@ $page = GETPOST('page','int');
$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha'); $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha'); $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha');
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipts"));
if ($prev_id) if ($prev_id)
{ {
@ -56,7 +56,7 @@ if ($prev_id)
if ($bon->fetch($prev_id) == 0) if ($bon->fetch($prev_id) == 0)
{ {
$head = prelevement_prepare_head($bon); $head = prelevement_prepare_head($bon);
dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment'); dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipts"), '', 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

4
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -46,7 +46,7 @@ $page = GETPOST('page','int');
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipts"));
if ($prev_id) if ($prev_id)
{ {
@ -55,7 +55,7 @@ if ($prev_id)
if ($bon->fetch($prev_id) == 0) if ($bon->fetch($prev_id) == 0)
{ {
$head = prelevement_prepare_head($bon); $head = prelevement_prepare_head($bon);
dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipt"), '', 'payment'); dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipts"), '', 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

4
htdocs/compta/prelevement/fiche-stat.php
View File

@ -44,7 +44,7 @@ $page = GETPOST('page','int');
* View * View
*/ */
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipts"));
if ($prev_id) if ($prev_id)
{ {
@ -53,7 +53,7 @@ if ($prev_id)
if ($bon->fetch($prev_id) == 0) if ($bon->fetch($prev_id) == 0)
{ {
$head = prelevement_prepare_head($bon); $head = prelevement_prepare_head($bon);
dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipt"), '', 'payment'); dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipts"), '', 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

4
htdocs/compta/prelevement/fiche.php
View File

@ -133,7 +133,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
$bon = new BonPrelevement($db,""); $bon = new BonPrelevement($db,"");
$form = new Form($db); $form = new Form($db);
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipts"));
if ($id > 0) if ($id > 0)
@ -141,7 +141,7 @@ if ($id > 0)
$bon->fetch($id); $bon->fetch($id);
$head = prelevement_prepare_head($bon); $head = prelevement_prepare_head($bon);
dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment'); dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment');
if (GETPOST('error','alpha')!='') if (GETPOST('error','alpha')!='')
{ {

2
htdocs/compta/prelevement/ligne.php
View File

@ -130,7 +130,7 @@ if ($id)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipt").'</td><td>'; print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipts").'</td><td>';
print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>'; print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>'; print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>'; print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';

4
htdocs/compta/prelevement/lignes.php
View File

@ -54,7 +54,7 @@ $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortf
* View * View
*/ */
llxHeader('',$langs->trans("WithdrawalReceipt")); llxHeader('',$langs->trans("WithdrawalReceipts"));
if ($prev_id) if ($prev_id)
{ {
@ -63,7 +63,7 @@ if ($prev_id)
if ($bon->fetch($prev_id) == 0) if ($bon->fetch($prev_id) == 0)
{ {
$head = prelevement_prepare_head($bon); $head = prelevement_prepare_head($bon);
dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipt"), '', 'payment'); dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipts"), '', 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

2
htdocs/compta/prelevement/liste.php
View File

@ -111,7 +111,7 @@ if ($result)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans("Line").'</td>'; print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
print_liste_field_titre($langs->trans("WithdrawalReceipt"),$_SERVER["PHP_SELF"],"p.ref"); print_liste_field_titre($langs->trans("WithdrawalReceipts"),$_SERVER["PHP_SELF"],"p.ref");
print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd); print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom"); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"'); print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');

8
htdocs/societe/rib.php
View File

@ -66,7 +66,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
$account->iban_prefix = $_POST["iban_prefix"]; $account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"]; $account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"]; $account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"]; $account->owner_address = $_POST["owner_address"];
$result = $account->update($user); $result = $account->update($user);
if (! $result) if (! $result)
@ -154,7 +154,7 @@ if ($_GET["socid"] && $_GET["action"] != 'edit')
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
print $account->adresse_proprio; print $account->owner_address;
print "</td></tr>\n"; print "</td></tr>\n";
print '</table>'; print '</table>';
@ -236,8 +236,8 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
print "<textarea name=\"adresse_proprio\" rows=\"4\" cols=\"40\">"; print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\">";
print $account->adresse_proprio; print $account->owner_address;
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '</table><br>'; print '</table><br>';