Skip to content

Commit

Permalink
Fix: Some config data are shared between suppliers orders and suppliers
Browse files Browse the repository at this point in the history
invoices
  • Loading branch information
simnandez committed Dec 23, 2013
1 parent aad7d32 commit d6b2f96
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -71,6 +71,7 @@ For users:
- Fix: [ bug #1022 ] correct margin calculation for credit notes.
- Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
- Fix: Lost stats filters into year selection.
- Fix: Some config data are shared between suppliers orders and suppliers invoices

New experimental module:
- New: [ task #157 ] Add a Skype button (adherents / third parties / contacts)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/admin/supplier_invoice.php
Expand Up @@ -458,10 +458,10 @@

print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_FREE_TEXT">';
print '<input type="hidden" name="action" value="set_SUPPLIER_INVOICE_FREE_TEXT">';
print '<tr '.$bc[$var].'><td colspan="2">';
print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>';
print '<textarea name="SUPPLIER_ORDER_FREE_TEXT" class="flat" cols="120">'.$conf->global->SUPPLIER_ORDER_FREE_TEXT.'</textarea>';
print '<textarea name="SUPPLIER_INVOICE_FREE_TEXT" class="flat" cols="120">'.$conf->global->SUPPLIER_INVOICE_FREE_TEXT.'</textarea>';
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td></tr>\n";
Expand Down
3 changes: 2 additions & 1 deletion htdocs/admin/supplierinvoice_extrafields.php
Expand Up @@ -5,6 +5,7 @@
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -49,7 +50,7 @@

$action=GETPOST('action', 'alpha');
$attrname=GETPOST('attrname', 'alpha');
$elementtype='commande_fournisseur'; //Must be the $table_element of the class that manage extrafield
$elementtype='facture_fourn'; //Must be the $table_element of the class that manage extrafield

if (!$user->admin) accessforbidden();

Expand Down

0 comments on commit d6b2f96

Please sign in to comment.