Skip to content

Commit

Permalink
Merge pull request #21 from frederic34/dev
Browse files Browse the repository at this point in the history
start to add product
  • Loading branch information
frederic34 authored Feb 4, 2024
2 parents 0116ecd + 6b4a924 commit c4d38b0
Show file tree
Hide file tree
Showing 6 changed files with 535 additions and 28 deletions.
4 changes: 2 additions & 2 deletions core/modules/commande/doc/doc_easydoc_order_html.modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public function __construct($db)
global $langs, $mysoc;

// Load translation files required by the page
$langs->loadLangs(["main", "companies"]);
$langs->loadLangs(['main', 'companies', 'easydocgenerator@easydocgenerator']);

$this->db = $db;
$this->name = "HTML templates";
$this->name = "Easydoc templates";
$this->description = $langs->trans("DocumentModelEasydocgeneratorTemplate");
// Name of constant that is used to save list of directories to scan
$this->scandir = 'ORDER_ADDON_EASYDOC_TEMPLATES_PATH';
Expand Down
8 changes: 4 additions & 4 deletions core/modules/facture/doc/doc_easydoc_invoice_html.modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public function __construct($db)
global $langs, $mysoc;

// Load translation files required by the page
$langs->loadLangs(["main", "companies"]);
$langs->loadLangs(["main", "companies", "easydocgenerator@easydocgenerator"]);

$this->db = $db;
$this->name = "HTML templates";
$this->name = "Easydoc templates";
$this->description = $langs->trans("DocumentModelEasydocgeneratorTemplate");
// Name of constant that is used to save list of directories to scan
$this->scandir = 'INVOICE_ADDON_EASYDOC_TEMPLATES_PATH';
Expand Down Expand Up @@ -146,8 +146,8 @@ public function info($langs)
$texthelp = $langs->trans("ListOfDirectoriesForModelGenHTML");
$texthelp .= '<br><br><span class="opacitymedium">' . $langs->trans("ExampleOfDirectoriesForModelGen") . '</span>';
// Add list of substitution keys
$texthelp .= '<br>' . $langs->trans("FollowingSubstitutionKeysCanBeUsed") . '<br>';
$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
// $texthelp .= '<br>' . $langs->trans("FollowingSubstitutionKeysCanBeUsed") . '<br>';
// $texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it

$text .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1, 3, $this->name);
$text .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
Expand Down
Loading

0 comments on commit c4d38b0

Please sign in to comment.