From a0fb27bd80dcd528ee740f514166e82e97dddda8 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 15 Sep 2015 14:34:49 +0200 Subject: [PATCH 01/15] FIX : Can create Proposal on close thridparty #3526 --- htdocs/comm/card.php | 12 ++++++------ htdocs/comm/propal.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 450a462c751..75e102b96bb 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -828,25 +828,25 @@ if ($id > 0) print '
'; - if (! empty($conf->propal->enabled) && $user->rights->propal->creer) + if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1) { $langs->load("propal"); print '
'.$langs->trans("AddProp").'
'; } - if (! empty($conf->commande->enabled) && $user->rights->commande->creer) + if (! empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status==1) { $langs->load("orders"); print '
'.$langs->trans("AddOrder").'
'; } - if ($user->rights->contrat->creer) + if ($user->rights->contrat->creer && $object->status==1) { $langs->load("contracts"); print '
'.$langs->trans("AddContract").'
'; } - if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) + if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status==1) { $langs->load("fichinter"); print '
'.$langs->trans("AddIntervention").'
'; @@ -855,7 +855,7 @@ if ($id > 0) // Add invoice if ($user->societe_id == 0) { - if (! empty($conf->deplacement->enabled)) + if (! empty($conf->deplacement->enabled) && $object->status==1) { $langs->load("trips"); print '
'.$langs->trans("AddTrip").'
'; @@ -863,7 +863,7 @@ if ($id > 0) if (! empty($conf->facture->enabled)) { - if ($user->rights->facture->creer) + if ($user->rights->facture->creer && $object->status==1) { $langs->load("bills"); $langs->load("orders"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b5302063a65..5fef6f8ae29 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1267,7 +1267,7 @@ if ($action == 'create') print ''; } else { print ''; - print $form->select_company('', 'socid', 's.client = 1 OR s.client = 2 OR s.client = 3', 1); + print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 1); print ''; } print '' . "\n"; From 8fd9d2a7cefc5b932ea2c908258207776036b920 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 16 Sep 2015 10:21:32 +0200 Subject: [PATCH 02/15] FIX : #3530 --- htdocs/fourn/facture/paiement.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index ba3f82c78e0..81fe1d6b345 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -5,11 +5,8 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin -<<<<<<< HEAD * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> -======= * Copyright (C) 2015 Marcos García ->>>>>>> refs/remotes/origin/3.6 * * 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 @@ -46,6 +43,7 @@ $confirm = GETPOST('confirm'); $facid=GETPOST('facid','int'); $socid=GETPOST('socid','int'); +$accountid = GETPOST('accountid'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -200,7 +198,7 @@ if (empty($reshook)) if (! $error) { - $result=$paiement->addPaymentToBank($user,'payment_supplier','(SupplierInvoicePayment)',$_POST['accountid'],'',''); + $result=$paiement->addPaymentToBank($user,'payment_supplier','(SupplierInvoicePayment)',$accountid,'',''); if ($result < 0) { setEventMessage($paiement->error, 'errors'); @@ -304,7 +302,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (! empty($conf->banque->enabled)) { print ''.$langs->trans('Account').''; - $form->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2); + $form->select_comptes(empty($accountid)?'':$accountid,'accountid',0,'',2); print ''; } else From cb31ab3e2b925a0feabdd511b78da063c7e22b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 16 Sep 2015 19:53:32 +0200 Subject: [PATCH 03/15] FIX Syntax error in Debian Apache configuration This issue prevented Apache from starting after dolibarr deb package installation with the following error: Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf: order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure' --- build/debian/apache/dolibarr.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian/apache/dolibarr.conf b/build/debian/apache/dolibarr.conf index 95eaae21190..bdbb6e1b4c3 100644 --- a/build/debian/apache/dolibarr.conf +++ b/build/debian/apache/dolibarr.conf @@ -15,7 +15,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # Require all granted # # -# Order allow, deny +# Order allow,deny # Allow from all # # @@ -27,7 +27,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs Require all granted - Order allow, deny + Order allow,deny Allow from all From 8dd843ab8f7e1947cabc359cf0ebcc41fde634c7 Mon Sep 17 00:00:00 2001 From: AlainRnet Date: Thu, 17 Sep 2015 23:23:18 +0200 Subject: [PATCH 04/15] Update categorie.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais) --- htdocs/categories/categorie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 0746475ecec..9e780223d0e 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -410,7 +410,7 @@ else if ($id || $ref) // Ref print ''.$langs->trans("Ref").''; print ''; - print $form->showrefnav($member,'id'); + print $form->showrefnav($member,'id','','1','rowid','ref','','&type=3'); print ''; // Login From 1901b2fb3bed1bab01dc96bc9234a60db79f27b8 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 19 Sep 2015 07:15:13 +0200 Subject: [PATCH 05/15] Missing translations in checks deposits exports --- htdocs/core/modules/modBanque.class.php | 2 +- htdocs/langs/en_US/bills.lang | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index efb242aca94..5103e76b4e7 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -164,7 +164,7 @@ class modBanque extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='Bordereaux remise Chq/Fact'; $this->export_permission[$r]=array(array("banque","export")); - $this->export_fields_array[$r]=array("bch.rowid"=>"bordereauid","bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation", + $this->export_fields_array[$r]=array("bch.rowid"=>"depositid","bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation", "bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","f.facnumber"=>"InvoiceRef" ); $this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date", diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index a78ff96511e..54a626b5ae9 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -383,6 +383,8 @@ ChequesReceipts=Checks receipts ChequesArea=Checks deposits area ChequeDeposits=Checks deposits Cheques=Checks +DepositId=Id deposit +NbCheque=Number of checks CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices ShowUnpaidAll=Show all unpaid invoices From 49f671eb1d430b0b2850942c11dc3e17a89a7da3 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 19 Sep 2015 07:24:32 +0200 Subject: [PATCH 06/15] Correct name --- htdocs/core/modules/modBanque.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 5103e76b4e7..aa83133bc08 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -164,7 +164,7 @@ class modBanque extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='Bordereaux remise Chq/Fact'; $this->export_permission[$r]=array(array("banque","export")); - $this->export_fields_array[$r]=array("bch.rowid"=>"depositid","bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation", + $this->export_fields_array[$r]=array("bch.rowid"=>"DepositId","bch.number"=>"Numero","bch.ref_ext"=>"RefExt",'ba.ref'=>'AccountRef','ba.label'=>'AccountLabel','b.datev'=>'DateValue','b.num_chq'=>'ChequeOrTransferNumber','b.amount'=>'Credit','b.num_releve'=>'AccountStatement','b.datec'=>"DateCreation", "bch.date_bordereau"=>"Date","bch.amount"=>"Total","bch.nbcheque"=>"NbCheque","bu.url_id"=>"IdThirdParty","s.nom"=>"ThirdParty","f.facnumber"=>"InvoiceRef" ); $this->export_TypeFields_array[$r]=array('ba.ref'=>'Text','ba.label'=>'Text','b.datev'=>'Date','b.num_chq'=>'Text','b.amount'=>'Numeric','b.num_releve'=>'Text','b.datec'=>"Date", From de04f3022c3150f905d75a855d20129f32add9c8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 20 Sep 2015 09:05:52 +0200 Subject: [PATCH 07/15] Fix: use get instead getJSON for avoid freezing --- htdocs/ecm/tpl/enablefiletreeajax.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php index b348cb03c72..7b2145d0f93 100644 --- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php +++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php @@ -51,7 +51,7 @@ $(document).ready(function() { $('#refreshbutton').click( function() { $.pleaseBePatient("trans('PleaseBePatient'); ?>"); - $.getJSON( "", { + $.get( "", { action: "build", element: "ecm" }, From 7d4a9b17b6d08d041637e25322dd4aacc1e992ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Sep 2015 13:59:22 +0200 Subject: [PATCH 08/15] FIX Creation of tables or keys must not be done with a random order. --- htdocs/core/modules/DolibarrModules.class.php | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index c886741fc41..0de1c7ab4ab 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -623,8 +623,14 @@ abstract class DolibarrModules { $dirfound++; - // Run llx_mytable.sql files + // Run llx_mytable.sql files, then llx_mytable_*.sql + $files = array(); while (($file = readdir($handle))!==false) + { + $files[] = $file; + } + sort($files); + foreach ($files as $file) { if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data') { @@ -635,8 +641,14 @@ abstract class DolibarrModules rewinddir($handle); - // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) + // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql + $files = array(); while (($file = readdir($handle))!==false) + { + $files[] = $file; + } + sort($files); + foreach ($files as $file) { if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data') { @@ -648,7 +660,13 @@ abstract class DolibarrModules rewinddir($handle); // Run data_xxx.sql files (Must be done after llx_mytable.key.sql) + $files = array(); while (($file = readdir($handle))!==false) + { + $files[] = $file; + } + sort($files); + foreach ($files as $file) { if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data') { @@ -660,7 +678,13 @@ abstract class DolibarrModules rewinddir($handle); // Run update_xxx.sql files + $files = array(); while (($file = readdir($handle))!==false) + { + $files[] = $file; + } + sort($files); + foreach ($files as $file) { if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update') { From f2e2edbc64311e744e7d6e11bef519e1e20050af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Sep 2015 15:10:52 +0200 Subject: [PATCH 09/15] FIX not closing CSS. --- htdocs/theme/eldy/style.css.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a3734e1e1ab..7ecf63b1000 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3669,7 +3669,6 @@ border-top-right-radius: 6px; .public_border { border: 1px solid #888; } -.public_liste_titre { From fe6af7d8eb48290b3475a8bb4afd99898e215d6d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Sep 2015 11:29:26 +0200 Subject: [PATCH 10/15] FIX Description of tags was mandatory in edit mode but not in create mode. Should not be mandatory. --- htdocs/categories/edit.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 362c2b324a1..98160cf9b6d 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -82,20 +82,16 @@ if ($action == 'update' && $user->rights->categorie->creer) if (empty($categorie->label)) { - $action = 'create'; + $error++; + $action = 'edit'; setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors'); } - if (empty($categorie->description)) - { - $action = 'create'; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")), 'errors'); - } if (empty($categorie->error)) { $ret = $extrafields->setOptionalsFromPost($extralabels,$categorie); if ($ret < 0) $error++; - if ($categorie->update($user) > 0) + if (! $error && $categorie->update($user) > 0) { header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$categorie->id.'&type='.$type); exit; @@ -138,14 +134,14 @@ dol_fiche_head(''); print ''; // Ref -print ''; print ''; // Description print ''; -print ''; +print ''; print '
'; +print '
'; print $langs->trans("Ref").''; print '
'.$langs->trans("Description").''.$langs->trans("Description").''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); From 178208918f0b4028209adc80b93d17aa25dbdccb Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Tue, 22 Sep 2015 12:03:11 +0200 Subject: [PATCH 11/15] FIX : remove twice same test --- htdocs/comm/propal.php | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 5c3b77fc391..8a17ad00b53 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -195,22 +195,18 @@ if (empty($reshook)) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { - // Define output language - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) - { - $outputlangs = $langs; - $newlang = ''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; - if (! empty($newlang)) { - $outputlangs = new Translate("", $conf); - $outputlangs->setDefaultLang($newlang); - } - $model=$object->modelpdf; - $ret = $object->fetch($id); // Reload to get new records - - $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + $outputlangs = $langs; + $newlang = ''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang; + if (! empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); } + $model=$object->modelpdf; + $ret = $object->fetch($id); // Reload to get new records + + $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); } } else { $langs->load("errors"); From 75daddbbe290ae0262cee1506f2b46cf2d57e1e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Sep 2015 15:40:17 +0200 Subject: [PATCH 12/15] Update ignore to secure --- build/makepack-dolibarr.pl | 3 ++- htdocs/.gitignore | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 2b31d1f26a6..99ec7b3543a 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -467,6 +467,7 @@ if ($nboftargetok) { # Removed known external modules to avoid any error when packaging from env where external modules are tested $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`; # For custom we want to keep dir + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`; @@ -481,8 +482,8 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`; - # Removed other test files $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`; + # Removed other test files $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`; # This is a dev tool $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; diff --git a/htdocs/.gitignore b/htdocs/.gitignore index 0b4d7b82790..ddead79d7bd 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -13,3 +13,4 @@ /ultimatepdf* /lead /dolimed* +/allscreens* From c125ba0d6656d88323368183c3d8f6a6b972a726 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Sep 2015 15:40:17 +0200 Subject: [PATCH 13/15] Update ignore to secure Conflicts: htdocs/.gitignore --- build/makepack-dolibarr.pl | 3 ++- htdocs/.gitignore | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index a4dbb40ae7c..18e7092fc1b 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -457,6 +457,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`; # Removed known external modules to avoir any error when packaging on test env $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`; # For custom we want to keep dir + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`; @@ -470,8 +471,8 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`; - # Removed other test files $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`; + # Removed other test files $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; diff --git a/htdocs/.gitignore b/htdocs/.gitignore index 160eae6f858..4b12a493530 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -11,3 +11,6 @@ /teclib* /test.php /ultimatepdf* +/lead +/dolimed* +/allscreens* \ No newline at end of file From 90b78702e51a5b9311a755b9191168abc12fcc2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Sep 2015 16:23:51 +0200 Subject: [PATCH 14/15] Update ignore to secure packaging --- htdocs/theme/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/theme/.gitignore b/htdocs/theme/.gitignore index bad6db7e4d2..7da676f680b 100644 --- a/htdocs/theme/.gitignore +++ b/htdocs/theme/.gitignore @@ -1,2 +1,3 @@ /bootstrap /oblyon +/allscreens/ From f1ab0d36c5a98c493e8f159a29265c91131c54b8 Mon Sep 17 00:00:00 2001 From: tysauron Date: Tue, 22 Sep 2015 22:37:31 +0200 Subject: [PATCH 15/15] Chmod new file not old file --- htdocs/core/lib/files.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 2f197d8b645..e49661be26f 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -627,7 +627,7 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1) else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING); } if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; - @chmod($newpathofsrcfile, octdec($newmask)); + @chmod($newpathofdestfile, octdec($newmask)); } return $result;