From 073170514f9383403213b22eb2374665bb800742 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 20 Sep 2012 09:13:02 +0200 Subject: [PATCH 1/5] Fix: increase memory limit --- htdocs/install/check.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index e407c037963..1f41542e059 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004-2009 Laurent Destailleur - * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2005-2010 Regis Houssin +/* Copyright (C) 2004-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -158,8 +158,8 @@ else // Check memory -$memrequiredorig='32M'; -$memrequired=32*1024*1024; +$memrequiredorig='64M'; +$memrequired=64*1024*1024; $memmaxorig=@ini_get("memory_limit"); $memmax=@ini_get("memory_limit"); if ($memmaxorig != '') From 4881d8f1c243098fbd91255ab1f004468d9baddf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2012 14:52:31 +0200 Subject: [PATCH 2/5] Fix: Horizontal scrolling --- htdocs/admin/dict.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 0d7ca6ae7ff..56c1434feac 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1262,7 +1262,10 @@ function fieldList($fieldlist,$obj='',$tabname='') else { print ''; - print ''; + $size=''; + if ($fieldlist[$field]=='libelle') $size='size="32" '; + if ($fieldlist[$field]=='accountancy_code') $size='size="9" '; + print ''; print ''; } } From 77ecd5c6fcd741fed191fba57bbb0430f77a6494 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 20 Sep 2012 15:55:51 +0200 Subject: [PATCH 3/5] =?UTF-8?q?[=20task=20#104=20]=20Possibilit=C3=A9=20de?= =?UTF-8?q?=20facturer=20plusieurs=20commandes.=20Working?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/orderstoinvoice.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 3cc4ded371b..5b1833ae50e 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -503,7 +503,9 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ' WHERE c.fk_soc = s.rowid'; + // Which invoice to show + /* if ($viewstatut <> '') { if ($viewstatut < 4 && $viewstatut > -2) @@ -524,6 +526,9 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected } } + */ + $sql.= " AND c.fk_statut in (1, 2) AND c.facture = 0"; + $sql.= ' AND s.entity = '.$conf->entity; if ($socid) $sql.= ' AND s.rowid = '.$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; From 38b7aa69cb5be7ce7c8d0e70d0bd3b479caf56d4 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 20 Sep 2012 15:57:53 +0200 Subject: [PATCH 4/5] =?UTF-8?q?[=20task=20#104=20]=20Possibilit=C3=A9=20de?= =?UTF-8?q?=20facturer=20plusieurs=20commandes.=20Working?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/orderstoinvoice.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 5b1833ae50e..ea165fe739c 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -504,7 +504,6 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ' WHERE c.fk_soc = s.rowid'; - // Which invoice to show /* if ($viewstatut <> '') { @@ -527,6 +526,8 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) } } */ + + // Which invoice to show $sql.= " AND c.fk_statut in (1, 2) AND c.facture = 0"; $sql.= ' AND s.entity = '.$conf->entity; From 22a28abed15c9847212275717cee36b1cf670e8c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2012 17:46:47 +0200 Subject: [PATCH 5/5] Fix: Add more sql fix commands --- htdocs/install/mysql/migration/repair.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 3a9673fb137..0e6c3c64c92 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -53,6 +53,21 @@ DELETE FROM llx_boxes where box_id NOT IN (SELECT rowid FROM llx_boxes_def); DELETE FROM llx_document_model WHERE nom ='elevement' AND type='delivery'; + +-- Fix: It seems this is missing for some users +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 1, 'AC_TEL', 'system', 'Phone call' ,NULL, 2); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 2, 'AC_FAX', 'system', 'Send Fax' ,NULL, 3); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 3, 'AC_PROP', 'systemauto', 'Send commercial proposal by email' ,'propal', 10); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 4, 'AC_EMAIL', 'system', 'Send Email' ,NULL, 4); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, 1); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 8, 'AC_COM', 'systemauto', 'Send customer order by email' ,'order', 8); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 9, 'AC_FAC', 'systemauto', 'Send customer invoice by email' ,'invoice', 6); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 10, 'AC_SHIP', 'systemauto', 'Send shipping by email' ,'shipping', 11); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 30, 'AC_SUP_ORD', 'systemauto', 'Send supplier order by email' ,'order_supplier', 9); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values (31, 'AC_SUP_INV', 'systemauto', 'Send supplier invoice by email' ,'invoice_supplier', 7); +insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 50, 'AC_OTH', 'system', 'Other' ,NULL, 5); + + -- VMYSQL4.1 DELETE T1 FROM llx_boxes_def as T1, llx_boxes_def as T2 where T1.entity = T2.entity AND T1.file = T2.file AND T1.note = T2.note and T1.rowid > T2.rowid -- VPGSQL8.2 DELETE FROM llx_boxes_def as T1 WHERE rowid NOT IN (SELECT min(rowid) FROM llx_boxes_def GROUP BY file, entity, note)