Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps2

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-09-12 18:32:15 +02:00
parent 7e0b1055db 358bc7ab1b
commit 998b67fa98
121 changed files with 762 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@@ -53,8 +53,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
{
global $conf,$langs,$mysoc;
$langs->load("main");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";
@@ -98,8 +98,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
{
global $conf,$langs;
$langs->load("companies");
$langs->load("errors");
// Load translation files required by the page
$langs->loadLangs(array("errors","companies"));
$form = new Form($this->db);