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

Fix: Can't enable document for supplier invoice/order

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-30 22:38:09 +00:00
parent e426172c47
commit c8013ac699
5 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/admin/fournisseur.php
View File

@ -132,10 +132,12 @@ if ($_GET["action"] == 'specimenfacture') // For invoices
if ($_GET["action"] == 'set') if ($_GET["action"] == 'set')
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$_GET["type"]."',".$conf->entity.")"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES ('".$_GET["value"]."','".$_GET["type"]."',".$conf->entity.")";
if ($db->query($sql)) $res=$db->query($sql);
if ($res)
{ {
} }
else dol_print_error($db);
} }
if ($_GET["action"] == 'del') if ($_GET["action"] == 'del')
@ -144,10 +146,12 @@ if ($_GET["action"] == 'del')
$sql.= " WHERE nom = '".$_GET["value"]."'"; $sql.= " WHERE nom = '".$_GET["value"]."'";
$sql.= " AND type = '".$_GET["type"]."'"; $sql.= " AND type = '".$_GET["type"]."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
if ($db->query($sql)) $db->query($sql);
if ($res)
{ {
} }
else dol_print_error($db);
} }
if ($_GET["action"] == 'setdoc') if ($_GET["action"] == 'setdoc')
@ -348,7 +352,7 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
print '<td>'.$langs->trans("Description").'</td>'."\n"; print '<td>'.$langs->trans("Description").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n"; print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n"; print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td align="center" width="32" colspan="2">'.$langs->trans("Info").'</td>'; print '<td align="center" width="40" colspan="2">'.$langs->trans("Info").'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
clearstatcache(); clearstatcache();
@ -366,8 +370,9 @@ if (is_resource($handle))
$classname = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12);
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">\n <td>$name"; print "<tr ".$bc[$var].">\n";
print "</td>\n <td>\n"; print "<td>".$name."</td>\n";
print "<td>\n";
require_once($dir.$file); require_once($dir.$file);
$module = new $classname($db,$specimenthirdparty); $module = new $classname($db,$specimenthirdparty);
print $module->description; print $module->description;
@ -379,7 +384,7 @@ if (is_resource($handle))
print '<td align="center">'."\n"; print '<td align="center">'."\n";
if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;type=supplier_order">'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;type=order_supplier">';
print img_picto($langs->trans("Enabled"),'on'); print img_picto($langs->trans("Enabled"),'on');
print '</a>'; print '</a>';
} }
@ -392,7 +397,7 @@ if (is_resource($handle))
else else
{ {
print '<td align="center">'."\n"; print '<td align="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;type=supplier_order">'.img_picto($langs->trans("Disabled"),'off').'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"),'off').'</a>';
print "</td>"; print "</td>";
} }
@ -404,7 +409,7 @@ if (is_resource($handle))
} }
else else
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;type=supplier_order"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'on').'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'on').'</a>';
} }
print '</td>'; print '</td>';
@ -472,7 +477,7 @@ print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
print '<td>'.$langs->trans("Description").'</td>'."\n"; print '<td>'.$langs->trans("Description").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n"; print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n"; print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td align="center" width="32" colspan="2">'.$langs->trans("Info").'</td>'; print '<td align="center" width="40" colspan="2">'.$langs->trans("Info").'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
clearstatcache(); clearstatcache();
@ -489,8 +494,9 @@ if (is_resource($handle))
$classname = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12);
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">\n <td>$name"; print "<tr ".$bc[$var].">\n";
print "</td>\n <td>\n"; print "<td>".$name."</td>\n";
print "<td>";
require_once($dir.$file); require_once($dir.$file);
$module = new $classname($db,$specimenthirdparty); $module = new $classname($db,$specimenthirdparty);
print $module->description; print $module->description;
@ -502,7 +508,7 @@ if (is_resource($handle))
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";
if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name") if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;type=supplier_invoice">'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;type=invoice_supplier">';
print img_picto($langs->trans("Enabled"),'on'); print img_picto($langs->trans("Enabled"),'on');
print '</a>'; print '</a>';
} }
@ -515,7 +521,7 @@ if (is_resource($handle))
else else
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;type=supplier_invoice">'.img_picto($langs->trans("Disabled"),'off').'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"),'off').'</a>';
print "</td>"; print "</td>";
} }
@ -527,7 +533,7 @@ if (is_resource($handle))
} }
else else
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;type=supplier_invoice" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'on').'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;type=invoice_supplier" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'on').'</a>';
} }
print '</td>'; print '</td>';

4
htdocs/core/class/html.formmail.class.php
View File

@ -470,8 +470,8 @@ class FormMail
if ($this->param["models"]=='facture_relance') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } if ($this->param["models"]=='facture_relance') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
if ($this->param["models"]=='propal_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); } if ($this->param["models"]=='propal_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); } if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
if ($this->param["models"]=='supplier_order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); } if ($this->param["models"]=='order_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
if ($this->param["models"]=='supplier_facture_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } if ($this->param["models"]=='invoice_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
$defaultmessage=make_substitutions($defaultmessage,$this->substit,$langs); $defaultmessage=make_substitutions($defaultmessage,$this->substit,$langs);
if (isset($_POST["message"])) $defaultmessage=$_POST["message"]; if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
$defaultmessage=str_replace('\n',"\n",$defaultmessage); $defaultmessage=str_replace('\n',"\n",$defaultmessage);

2
htdocs/fourn/commande/fiche.php
View File

@ -1466,7 +1466,7 @@ if ($id > 0 || ! empty($ref))
$formmail->substit['__ORDERREF__']=$commande->ref; $formmail->substit['__ORDERREF__']=$commande->ref;
// Tableau des parametres complementaires // Tableau des parametres complementaires
$formmail->param['action']='send'; $formmail->param['action']='send';
$formmail->param['models']='supplier_order_send'; $formmail->param['models']='order_supplier_send';
$formmail->param['orderid']=$commande->id; $formmail->param['orderid']=$commande->id;
$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$commande->id; $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$commande->id;

2
htdocs/fourn/facture/fiche.php
View File

@ -1859,7 +1859,7 @@ else
$formmail->substit['__FACREF__']=$fac->ref; $formmail->substit['__FACREF__']=$fac->ref;
// Tableau des parametres complementaires // Tableau des parametres complementaires
$formmail->param['action']='send'; $formmail->param['action']='send';
$formmail->param['models']='supplier_facture_send'; $formmail->param['models']='invoice_supplier_send';
$formmail->param['facid']=$fac->id; $formmail->param['facid']=$fac->id;
$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?facid='.$fac->id; $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?facid='.$fac->id;

2
htdocs/includes/modules/modFournisseur.class.php
View File

@ -273,7 +273,7 @@ class modFournisseur extends DolibarrModules
$sql = array( $sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_order',".$conf->entity.")", "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','order_supplier',".$conf->entity.")",
); );
$this->load_datas(); $this->load_datas();