Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Gestion multilangue sur les modeles de document gnrs

Browse Source
This commit is contained in:
Laurent Destailleur
2006-06-18 15:48:28 +00:00
parent 2c7e337bec
commit 884c5f539d
12 changed files with 126 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
htdocs/comm/propal.php
View File

@@ -96,9 +96,12 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
{ {
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET['propalid']); $propal->fetch($_GET['propalid']);
$propal->delete_product($_GET['ligne']); $result=$propal->delete_product($_GET['ligne']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }
Header('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET['propalid']); Header('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET['propalid']);
@@ -112,8 +115,11 @@ if ($_POST['action'] == 'confirm_validate' && $_POST['confirm'] == 'yes')
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET['propalid']); $propal->fetch($_GET['propalid']);
$result=$propal->update_price($_GET['propalid']); $result=$propal->update_price($_GET['propalid']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
$result=$propal->valid($user); $result=$propal->valid($user);
} }
@@ -229,8 +235,11 @@ if ($_POST['action'] == 'add')
$db->commit(); $db->commit();
// Generation document PDF // Generation document PDF
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $id, $_POST['model'], $outputlangs); propale_pdf_create($db, $id, $_POST['model'], $outputlangs);
Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$id); Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$id);
@@ -465,8 +474,11 @@ if ($_POST['action'] == "addligne" && $user->rights->propale->creer)
$_POST['remise_percent'] $_POST['remise_percent']
); );
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }
} }
@@ -486,8 +498,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
$_POST['tva_tx'], $_POST['tva_tx'],
$_POST['desc']); $_POST['desc']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }
@@ -499,8 +514,11 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET['propalid']); $propal->fetch($_GET['propalid']);
if ($_POST['model']) $propal->set_pdf_model($user, $_POST['model']); if ($_POST['model']) $propal->set_pdf_model($user, $_POST['model']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }
@@ -513,8 +531,11 @@ if ($_GET['action'] == 'del_ligne' && $user->rights->propale->creer && !$conf->g
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET['propalid']); $propal->fetch($_GET['propalid']);
$propal->delete_product($_GET['ligne']); $propal->delete_product($_GET['ligne']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
} }

42
htdocs/commande/fiche.php
View File

@@ -253,8 +253,11 @@ if ($_POST['action'] == 'addligne' && $user->rights->commande->creer)
$_POST['remise_percent'] $_POST['remise_percent']
); );
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs); commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
} }
} }
@@ -277,8 +280,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->commande->creer && $_POS
if ($result >= 0) if ($result >= 0)
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs); commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs);
} }
else else
@@ -301,7 +307,12 @@ if ($_GET['action'] == 'deleteline' && $user->rights->commande->creer && !$conf-
$commande = new Commande($db); $commande = new Commande($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);
$result = $commande->delete_line($_GET['lineid']); $result = $commande->delete_line($_GET['lineid']);
commande_pdf_create($db, $_GET['id'], $commande->modelpdf); if ($_REQUEST['lang_id'])
{
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_pdf_create($db, $_GET['id'], $commande->modelpdf, $outputlangs);
Header('Location: fiche.php?id='.$_GET['id']); Header('Location: fiche.php?id='.$_GET['id']);
exit; exit;
} }
@@ -348,7 +359,12 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
$commande = new Commande($db); $commande = new Commande($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);
$commande->delete_line($_GET['lineid']); $commande->delete_line($_GET['lineid']);
commande_pdf_create($db, $_GET['id'], $commande->modelpdf); if ($_REQUEST['lang_id'])
{
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_pdf_create($db, $_GET['id'], $commande->modelpdf, $outputlangs);
} }
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET['id']); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET['id']);
exit; exit;
@@ -386,13 +402,16 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
* Generation de la commande * Generation de la commande
* d<>finit dans /includes/modules/commande/modules_commande.php * d<>finit dans /includes/modules/commande/modules_commande.php
*/ */
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
// Sauvegarde le dernier mod<6F>le choisi pour g<>n<EFBFBD>rer un document // Sauvegarde le dernier mod<6F>le choisi pour g<>n<EFBFBD>rer un document
$commande = new Commande($db, 0, $_REQUEST['id']); $commande = new Commande($db, 0, $_REQUEST['id']);
$commande->set_pdf_model($user, $_REQUEST['model']); $commande->set_pdf_model($user, $_REQUEST['model']);
if ($_REQUEST['lang_id'])
{
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=commande_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs); $result=commande_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
if ($result <= 0) if ($result <= 0)
{ {
@@ -1698,8 +1717,11 @@ else
// Construit PDF si non existant // Construit PDF si non existant
if (! is_readable($file)) if (! is_readable($file))
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
$outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=commande_pdf_create($db, $_REQUEST['id'], '', $_REQUEST['model'], $outputlangs); $result=commande_pdf_create($db, $_REQUEST['id'], '', $_REQUEST['model'], $outputlangs);
if ($result <= 0) if ($result <= 0)
{ {

35
htdocs/compta/facture.php
View File

@@ -142,8 +142,11 @@ if ($_POST['action'] == 'confirm_valid' && $_POST['confirm'] == 'yes' && $user->
$result = $fac->set_valid($fac->id, $user, $soc); $result = $fac->set_valid($fac->id, $user, $soc);
if ($result) if ($result)
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs); facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
} }
} }
@@ -477,8 +480,11 @@ if ($_POST['action'] == 'updateligne' && $user->rights->facture->creer && $_POST
$_POST['tva_tx'] $_POST['tva_tx']
); );
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs);
$_GET['facid']=$_POST['facid']; // Pour r<>affichage de la fiche en cours d'<27>dition $_GET['facid']=$_POST['facid']; // Pour r<>affichage de la fiche en cours d'<27>dition
@@ -682,8 +688,11 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
$facture = new Facture($db, 0, $_GET['facid']); $facture = new Facture($db, 0, $_GET['facid']);
$facture->fetch($_GET['facid']); $facture->fetch($_GET['facid']);
if ($_REQUEST['model']) $facture->set_pdf_model($user, $_REQUEST['model']); if ($_REQUEST['model']) $facture->set_pdf_model($user, $_REQUEST['model']);
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=facture_pdf_create($db, $facture->id, '', $facture->modelpdf, $outputlangs); $result=facture_pdf_create($db, $facture->id, '', $facture->modelpdf, $outputlangs);
if ($result <= 0) if ($result <= 0)
{ {
@@ -2270,8 +2279,11 @@ else
// Construit PDF si non existant // Construit PDF si non existant
if (! is_readable($file)) if (! is_readable($file))
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs); $result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
if ($result <= 0) if ($result <= 0)
{ {
@@ -2321,8 +2333,11 @@ else
// Construit PDF si non existant // Construit PDF si non existant
if (! is_readable($file)) if (! is_readable($file))
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
if ($_REQUEST['lang_id']) $outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs); $result=facture_pdf_create($db, $fac->id, '', $_REQUEST['model'], $outputlangs);
if ($result <= 0) if ($result <= 0)
{ {

7
htdocs/expedition/fiche.php
View File

@@ -134,8 +134,11 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
*/ */
if ($_REQUEST['action'] == 'builddoc') // En get ou en post if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
$outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=expedition_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs); $result=expedition_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
if ($result <= 0) if ($result <= 0)
{ {

7
htdocs/fichinter/fiche.php
View File

@@ -105,8 +105,11 @@ if ($_POST["action"] == 'update')
*/ */
if ($_REQUEST['action'] == 'builddoc') // En get ou en post if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
$outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=fichinter_pdf_create($db, $_REQUEST['id'], $_REQUEST['model'], $outputlangs); $result=fichinter_pdf_create($db, $_REQUEST['id'], $_REQUEST['model'], $outputlangs);
if ($result <= 0) if ($result <= 0)
{ {

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

@@ -202,13 +202,23 @@ if ($_POST["action"] == 'confirm_cancel' && $_POST["confirm"] == yes && $user->r
*/ */
if ($_POST['action'] == 'builddoc') if ($_POST['action'] == 'builddoc')
{ {
commande_supplier_pdf_create($db, $_GET['id'],$_POST['model']); if ($_REQUEST['lang_id'])
{
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_supplier_pdf_create($db, $_GET['id'],$_POST['model'],$outputlangs);
} }
if($_GET['action'] == 'builddoc') if($_GET['action'] == 'builddoc')
{ {
$commande = new CommandeFournisseur($db); $commande = new CommandeFournisseur($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);
commande_supplier_pdf_create($db, $_GET['id'],$commande->modelpdf); if ($_REQUEST['lang_id'])
{
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
commande_supplier_pdf_create($db, $_GET['id'],$commande->modelpdf,$outputlangs);
} }
/* /*

4
htdocs/fourn/commande/modules/modules_commandefournisseur.php
View File

@@ -135,7 +135,7 @@ class ModeleNumRefCommandesSuppliers
} }
} }
function commande_supplier_pdf_create($db, $comid, $modele='') function commande_supplier_pdf_create($db, $comid, $modele='',$outputlangs='')
{ {
global $langs; global $langs;
$langs->load("suppliers"); $langs->load("suppliers");
@@ -164,7 +164,7 @@ function commande_supplier_pdf_create($db, $comid, $modele='')
$obj = new $classname($db); $obj = new $classname($db);
if ( $obj->write_pdf_file($comid) > 0) if ($obj->write_pdf_file($comid,$outputlangs) > 0)
{ {
// on supprime l'image correspondant au preview // on supprime l'image correspondant au preview
commande_supplier_delete_preview($db, $comid); commande_supplier_delete_preview($db, $comid);

2
htdocs/includes/modules/commande/modules_commande.php
View File

@@ -184,7 +184,7 @@ function commande_pdf_create($db, $id, $modele='', $outputlangs='')
$obj = new $classname($db); $obj = new $classname($db);
if ( $obj->write_pdf_file($id, $outputlangs) > 0) if ($obj->write_pdf_file($id, $outputlangs) > 0)
{ {
// on supprime l'image correspondant au preview // on supprime l'image correspondant au preview
commande_delete_preview($db, $id); commande_delete_preview($db, $id);

2
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@@ -799,7 +799,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->trans("Ref")." : " . $fac->ref, '', 'R'); $pdf->MultiCell(100, 4, $outputlangs->trans("Ref")." : " . $fac->ref, '', 'R');
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);

2
htdocs/includes/modules/fichinter/modules_fichinter.php
View File

@@ -178,7 +178,7 @@ function fichinter_pdf_create($db, $id, $modele='', $outputlangs='')
$obj = new $classname($db); $obj = new $classname($db);
if ( $obj->write_pdf_file($id,$outputlangs) > 0) if ($obj->write_pdf_file($id,$outputlangs) > 0)
{ {
return 1; return 1;
} }

7
htdocs/livraison/fiche.php
View File

@@ -140,8 +140,11 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
*/ */
if ($_REQUEST['action'] == 'builddoc') // En get ou en post if ($_REQUEST['action'] == 'builddoc') // En get ou en post
{ {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); if ($_REQUEST['lang_id'])
$outputlangs->setDefaultLang($_REQUEST['lang_id']); {
$outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs");
$outputlangs->setDefaultLang($_REQUEST['lang_id']);
}
$result=delivery_order_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs); $result=delivery_order_pdf_create($db, $_REQUEST['id'],$_REQUEST['model'],$outputlangs);
if ($result <= 0) if ($result <= 0)
{ {

2
htdocs/livraison/mods/modules_livraison.php
View File

@@ -164,7 +164,7 @@ function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs=''
$obj = new $classname($db); $obj = new $classname($db);
if ( $obj->write_pdf_file($deliveryid) > 0) if ($obj->write_pdf_file($deliveryid,$outputlangs) > 0)
{ {
// on supprime l'image correspondant au preview // on supprime l'image correspondant au preview
delivery_order_delete_preview($db, $deliveryid); delivery_order_delete_preview($db, $deliveryid);