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

Debug BOM/MO

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-05 19:18:12 +01:00
parent 204475efb9
commit 84a8d4e7cb
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
View File

@ -188,7 +188,7 @@ class doc_generic_bom_odt extends ModelePDFBom
/** /**
* Function to build a document on disk using the generic odt module. * Function to build a document on disk using the generic odt module.
* *
* @param Commande $object Object source to build document * @param BOM $object Object source to build document
* @param Translate $outputlangs Lang output object * @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file * @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
@ -222,13 +222,13 @@ class doc_generic_bom_odt extends ModelePDFBom
$outputlangs->loadLangs(array("main", "dict", "companies", "bills")); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->commande->dir_output) if ($conf->bom->dir_output)
{ {
// If $object is id instead of object // If $object is id instead of object
if (! is_object($object)) if (! is_object($object))
{ {
$id = $object; $id = $object;
$object = new Commande($this->db); $object = new Bom($this->db);
$result=$object->fetch($id); $result=$object->fetch($id);
if ($result < 0) if ($result < 0)
{ {
@ -237,7 +237,7 @@ class doc_generic_bom_odt extends ModelePDFBom
} }
} }
$dir = $conf->commande->multidir_output[$object->entity]; $dir = $conf->bom->multidir_output[$object->entity];
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref; if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt"; $file = $dir . "/" . $objectref . ".odt";
@ -309,11 +309,7 @@ class doc_generic_bom_odt extends ModelePDFBom
// Make substitution // Make substitution
$substitutionarray=array( $substitutionarray=array(
'__FROM_NAME__' => $this->emetteur->name, '__QTY_TO_PRODUCE__' => $object->qty,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
'__TOTAL_VAT__' => $object->total_vat
); );
complete_substitutions_array($substitutionarray, $langs, $object); complete_substitutions_array($substitutionarray, $langs, $object);
// Call the ODTSubstitution hook // Call the ODTSubstitution hook
@ -322,7 +318,7 @@ class doc_generic_bom_odt extends ModelePDFBom
// Line of free text // Line of free text
$newfreetext=''; $newfreetext='';
$paramfreetext='ORDER_FREE_TEXT'; $paramfreetext='BOM_FREE_TEXT';
if (! empty($conf->global->$paramfreetext)) if (! empty($conf->global->$paramfreetext))
{ {
$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray); $newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray);
@ -334,7 +330,7 @@ class doc_generic_bom_odt extends ModelePDFBom
$odfHandler = new odf( $odfHandler = new odf(
$srctemplatepath, $srctemplatepath,
array( array(
'PATH_TO_TMP' => $conf->commande->dir_temp, 'PATH_TO_TMP' => $conf->bom->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{', 'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}' 'DELIMITER_RIGHT' => '}'

20
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
View File

@ -86,7 +86,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$this->marge_basse=0; $this->marge_basse=0;
$this->option_logo = 1; // Affiche logo $this->option_logo = 1; // Affiche logo
$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION $this->option_tva = 0; // Gere option tva
$this->option_modereg = 0; // Affiche mode reglement $this->option_modereg = 0; // Affiche mode reglement
$this->option_condreg = 0; // Affiche conditions reglement $this->option_condreg = 0; // Affiche conditions reglement
$this->option_codeproduitservice = 0; // Affiche code produit-service $this->option_codeproduitservice = 0; // Affiche code produit-service
@ -195,7 +195,7 @@ class doc_generic_mo_odt extends ModelePDFMo
/** /**
* Function to build a document on disk using the generic odt module. * Function to build a document on disk using the generic odt module.
* *
* @param Commande $object Object source to build document * @param MO $object Object source to build document
* @param Translate $outputlangs Lang output object * @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file * @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details * @param int $hidedetails Do not show line details
@ -229,13 +229,13 @@ class doc_generic_mo_odt extends ModelePDFMo
$outputlangs->loadLangs(array("main", "dict", "companies", "bills")); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->commande->dir_output) if ($conf->mrp->dir_output)
{ {
// If $object is id instead of object // If $object is id instead of object
if (! is_object($object)) if (! is_object($object))
{ {
$id = $object; $id = $object;
$object = new Commande($this->db); $object = new MO($this->db);
$result=$object->fetch($id); $result=$object->fetch($id);
if ($result < 0) if ($result < 0)
{ {
@ -244,7 +244,7 @@ class doc_generic_mo_odt extends ModelePDFMo
} }
} }
$dir = $conf->commande->multidir_output[$object->entity]; $dir = $conf->mrp->multidir_output[$object->entity];
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref; if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
$file = $dir . "/" . $objectref . ".odt"; $file = $dir . "/" . $objectref . ".odt";
@ -316,11 +316,7 @@ class doc_generic_mo_odt extends ModelePDFMo
// Make substitution // Make substitution
$substitutionarray=array( $substitutionarray=array(
'__FROM_NAME__' => $this->emetteur->name, '__QTY_TO_PRODUCE__' => $object->qty,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
'__TOTAL_VAT__' => $object->total_vat
); );
complete_substitutions_array($substitutionarray, $langs, $object); complete_substitutions_array($substitutionarray, $langs, $object);
// Call the ODTSubstitution hook // Call the ODTSubstitution hook
@ -329,7 +325,7 @@ class doc_generic_mo_odt extends ModelePDFMo
// Line of free text // Line of free text
$newfreetext=''; $newfreetext='';
$paramfreetext='ORDER_FREE_TEXT'; $paramfreetext='MRP_MO_FREE_TEXT';
if (! empty($conf->global->$paramfreetext)) if (! empty($conf->global->$paramfreetext))
{ {
$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray); $newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray);
@ -341,7 +337,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$odfHandler = new odf( $odfHandler = new odf(
$srctemplatepath, $srctemplatepath,
array( array(
'PATH_TO_TMP' => $conf->commande->dir_temp, 'PATH_TO_TMP' => $conf->mrp->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy. 'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{', 'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}' 'DELIMITER_RIGHT' => '}'