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

Merge pull request #9528 from grandoc/new_branch_16_09_2018

Browse Source 
New branch 16 09 2018
This commit is contained in:
Laurent Destailleur 2018-09-18 15:01:23 +02:00 committed by GitHub
commit d72446cebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fichinter/card-rec.php
View File

@ -46,11 +46,8 @@ if (! empty($conf->contrat->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcontract.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcontract.class.php';
} }
// Load translation files required by the page
$langs->load('bills'); $langs->loadLangs(array("interventions","admin","compta","bills"));
$langs->load('compta');
$langs->load('admin');
$langs->load("interventions");
// Security check // Security check
$id=(GETPOST('fichinterid', 'int')?GETPOST('fichinterid', 'int'):GETPOST('id', 'int')); $id=(GETPOST('fichinterid', 'int')?GETPOST('fichinterid', 'int'):GETPOST('id', 'int'));

6
htdocs/fichinter/stats/index.php
View File

@ -49,10 +49,8 @@ $endyear=$year;
$object_status=GETPOST('object_status'); $object_status=GETPOST('object_status');
$langs->load('interventions'); // Load translation files required by the page
$langs->load('companies'); $langs->loadLangs(array("interventions","suppliers","companies","other"));
$langs->load('other');
$langs->load('suppliers');
/* /*

4
htdocs/fourn/ajax/getSupplierPrices.php
View File

@ -34,8 +34,8 @@ $idprod=GETPOST('idprod','int');
$prices = array(); $prices = array();
$langs->load('stocks'); // Load translation files required by the page
$langs->load('margins'); $langs->loadLangs(array("stocks","margins"));
/* /*

6
htdocs/fourn/commande/contact.php
View File

@ -33,10 +33,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
} }
$langs->load("facture"); // Load translation files required by the page
$langs->load("orders"); $langs->loadLangs(array("facture","orders","sendings","companies"));
$langs->load("sendings");
$langs->load("companies");
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');

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

@ -5,9 +5,9 @@
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Cedric Gross <c.gross@kreiz-it.fr> * Copyright (C) 2014 Cedric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2016 Florian Henry <florian.henry@atm-consulting.fr> * Copyright (C) 2016 Florian Henry <florian.henry@atm-consulting.fr>
* Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -40,13 +40,9 @@ require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
if (! empty($conf->projet->enabled)) if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
$langs->load('orders'); // Load translation files required by the page
$langs->load('sendings'); $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks"));
$langs->load('companies');
$langs->load('bills');
$langs->load('deliveries');
$langs->load('products');
$langs->load('stocks');
if (! empty($conf->productbatch->enabled)) if (! empty($conf->productbatch->enabled))
$langs->load('productbatch'); $langs->load('productbatch');

10
htdocs/fourn/commande/document.php
View File

@ -38,14 +38,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
} }
$langs->load('orders'); // Load translation files required by the page
$langs->load('other'); $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks","other"));
$langs->load('sendings');
$langs->load('companies');
$langs->load('bills');
$langs->load('deliveries');
$langs->load('products');
$langs->load('stocks');
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');

4
htdocs/fourn/commande/index.php
View File

@ -34,8 +34,8 @@ $orderid = GETPOST('orderid');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande'); $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
$langs->load("suppliers"); // Load translation files required by the page
$langs->load("orders"); $langs->loadLangs(array("suppliers", "orders"));
/* /*

6
htdocs/fourn/commande/info.php
View File

@ -33,10 +33,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
} }
$langs->load("orders"); // Load translation files required by the page
$langs->load("suppliers"); $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
$langs->load("companies");
$langs->load('stocks');
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$ref=GETPOST('ref','alpha'); $ref=GETPOST('ref','alpha');

8
htdocs/fourn/commande/note.php
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2017 Ferran Marcet <fmarcet@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -32,10 +32,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
} }
$langs->load("orders"); // Load translation files required by the page
$langs->load("suppliers"); $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
$langs->load("companies");
$langs->load('stocks');
$id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'); $id = GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int');
$ref = GETPOST('ref'); $ref = GETPOST('ref');

15
htdocs/fourn/commande/orderstoinvoice.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
@ -8,7 +8,7 @@
* Copyright (C) 2012-2017 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012-2017 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -41,9 +41,8 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
} }
$langs->load('orders'); // Load translation files required by the page
$langs->load('deliveries'); $langs->loadLangs(array("orders", "companies", "deliveries"));
$langs->load('companies');
if (! $user->rights->fournisseur->facture->creer) if (! $user->rights->fournisseur->facture->creer)
accessforbidden(); accessforbidden();
@ -105,9 +104,9 @@ if (($action == 'create' || $action == 'add') && ! $error) {
if (! empty($conf->projet->enabled)) if (! empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
$langs->load('bills'); // Load translation files required by the page
$langs->load('products'); $langs->loadLangs(array("bills", "main", "products"));
$langs->load('main');
if (isset($_GET['orders_to_invoice'])) { if (isset($_GET['orders_to_invoice'])) {
$orders_id = GETPOST('orders_to_invoice','',1); $orders_id = GETPOST('orders_to_invoice','',1);
$n = count($orders_id); $n = count($orders_id);