From 08d8da4b69995c6a0bf6be5374c6aaac9eb4cb86 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 31 Jul 2015 01:23:06 +0200 Subject: [PATCH 1/2] Removed useless files --- dev/ansible/README.md | 14 ----------- dev/ansible/deployplaybook/deploydev.yml | 24 ------------------- .../deployplaybook/files/apachealias.conf | 2 -- dev/ansible/deployplaybook/hosts | 2 -- .../deployplaybook/templates/info.html.j2 | 10 -------- 5 files changed, 52 deletions(-) delete mode 100644 dev/ansible/README.md delete mode 100644 dev/ansible/deployplaybook/deploydev.yml delete mode 100644 dev/ansible/deployplaybook/files/apachealias.conf delete mode 100644 dev/ansible/deployplaybook/hosts delete mode 100644 dev/ansible/deployplaybook/templates/info.html.j2 diff --git a/dev/ansible/README.md b/dev/ansible/README.md deleted file mode 100644 index e498ebc3340..00000000000 --- a/dev/ansible/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# This directory contains script example to use ansible to deploy or maitains dolibarr instances - -This is a quick tutorial: - -* Install ansible: -> apt-get install ansible - -* Add ip of server to manage into -/etc/ansible/hosts - -* Deploy public key to managed servers -- authorized_key: user=charlie key="{{ lookup('file', '/home/charlie/.ssh/id_rsa.pub') }}" - - diff --git a/dev/ansible/deployplaybook/deploydev.yml b/dev/ansible/deployplaybook/deploydev.yml deleted file mode 100644 index 5802fb10a1e..00000000000 --- a/dev/ansible/deployplaybook/deploydev.yml +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env ansible-playbook - -# Run script with ansible-playbook deploydev.yml -# or ./deploydev.yml - -- name: Configure webserver with apache - hosts: webservers - sudo: True - tasks: - - name: install apache - apt: name=apache update_cache=yes - - name: copy apache config file - copy: src=files/apachealias.conf dest=/etc/apache/conf.d/dolibarr_dev - #- name: enable configuration - # file: > - # dest=/etc/apache/sites-enabled/default - # src=/etc/apache/sites-available/default - # state=link - - name: copy info.html - template: src=templates/info.html.j2 dest=/var/www/dolibarr_dev/info.html - mode=0644 - - name: restart apache - service: name=apache state=restarted - diff --git a/dev/ansible/deployplaybook/files/apachealias.conf b/dev/ansible/deployplaybook/files/apachealias.conf deleted file mode 100644 index d801094af5a..00000000000 --- a/dev/ansible/deployplaybook/files/apachealias.conf +++ /dev/null @@ -1,2 +0,0 @@ - -Alias /dolibarr_dev /var/www/dolibarr diff --git a/dev/ansible/deployplaybook/hosts b/dev/ansible/deployplaybook/hosts deleted file mode 100644 index 99627faba2b..00000000000 --- a/dev/ansible/deployplaybook/hosts +++ /dev/null @@ -1,2 +0,0 @@ -[webservers] -testserver ansible_ssh_host=127.0.0.1 ansible_ssh_port=22 diff --git a/dev/ansible/deployplaybook/templates/info.html.j2 b/dev/ansible/deployplaybook/templates/info.html.j2 deleted file mode 100644 index 66fac1c4deb..00000000000 --- a/dev/ansible/deployplaybook/templates/info.html.j2 +++ /dev/null @@ -1,10 +0,0 @@ - - - Page info ansible - - -

Apache, configured by Ansible

-

If you can see this, Ansible successfully installed apache.

-

{{ ansible_managed }}

- - \ No newline at end of file From 3d847ac894d61af7fe36e38f9e7dd66381d37cbf Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 1 Aug 2015 14:29:32 +0200 Subject: [PATCH 2/2] Fix #3217 [Stocks] Warehouse list shows SQL request --- htdocs/product/stock/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 2c48b4587a0..eb963e81e3c 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2015 Juanjo Menent * * 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 @@ -68,7 +69,7 @@ if ($sall) $sql.= natural_search(array('e.label','e.description','e.lieu','e.add $sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays"; $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1, $offset); -print $sql; + $result = $db->query($sql); if ($result) {