From 8a9c9f49d5d20af141d7587eff867d6f97564e76 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Fri, 2 Oct 2015 12:37:13 +0200 Subject: [PATCH 1/4] fix : Typo --- ChangeLog | 2 +- htdocs/comm/askpricesupplier/card.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/fourn/commande/card.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e079038cd01..adf616485b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -344,7 +344,7 @@ For users: Use accesskey on form search. - New: Intervention documents are now available in ECM module. - New: Add attachments on user card + in ECM module. -- New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or content template. +- New: Can add __PROJECT_REF__ and __THIRDPARTY_NAME__ into email topic or content template. - New: [ task #1204 ] add Numering contrat module free (like leopard in product module). - New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice. - New: Enable supplier price log table. diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index 22732c1a19d..101160cf482 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -1800,7 +1800,7 @@ if ($action == 'create') // Tableau des substitutions $formmail->substit['__ASKREF__'] = $object->ref; $formmail->substit['__SIGNATURE__'] = $user->signature; - $formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit['__CONTACTCIVNAME__'] = ''; $formmail->substit['__PERSONALIZED__'] = ''; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 31603acc5a1..b6ef394a188 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2367,7 +2367,7 @@ if ($action == 'create') $formmail->substit['__PROPREF__'] = $object->ref; $formmail->substit['__SIGNATURE__'] = $user->signature; $formmail->substit['__REFCLIENT__'] = $object->ref_client; - $formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit['__PERSONALIZED__'] = ''; $formmail->substit['__CONTACTCIVNAME__'] = ''; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 109746b4e64..6117a013e8b 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2405,7 +2405,7 @@ if ($action == 'create' && $user->rights->commande->creer) $formmail->substit ['__ORDERREF__'] = $object->ref; $formmail->substit ['__SIGNATURE__'] = $user->signature; $formmail->substit ['__REFCLIENT__'] = $object->ref_client; - $formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit ['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit ['__PERSONALIZED__'] = ''; $formmail->substit ['__CONTACTCIVNAME__'] = ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 86d3af1fcf8..b96edc31b2c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3857,7 +3857,7 @@ else if ($id > 0 || ! empty($ref)) $formmail->substit['__FACREF__'] = $object->ref; $formmail->substit['__SIGNATURE__'] = $user->signature; $formmail->substit['__REFCLIENT__'] = $object->ref_client; - $formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:''); $formmail->substit['__PERSONALIZED__'] = ''; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 9b0001e79d6..fccd2652ed3 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2330,7 +2330,7 @@ elseif (! empty($object->id)) // Tableau des substitutions $formmail->substit['__ORDERREF__']=$object->ref; $formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier; - $formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit['__SIGNATURE__']=$user->signature; $formmail->substit['__PERSONALIZED__']=''; From 31acab92a6628bbe433770cb8ec54fc9e343cb3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Oct 2015 18:48:51 +0200 Subject: [PATCH 2/4] Doc comments --- htdocs/commande/card.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 109746b4e64..c271fc1e6b6 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1427,6 +1427,8 @@ if ($action == 'create' && $user->rights->commande->creer) $form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1); print ''; + // TODO How record was recorded OrderMode (llx_c_input_method) + // Project if (! empty($conf->projet->enabled) && $socid > 0) { @@ -1968,7 +1970,7 @@ if ($action == 'create' && $user->rights->commande->creer) } print ''; - // Source + // Origin print ''; print ''; + // TODO How record was recorded OrderMode (llx_c_input_method) + // Project if (! empty($conf->projet->enabled)) { From bea789edfef5ee16f22ece7b20e9145b1f5d2f22 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Oct 2015 20:09:54 +0200 Subject: [PATCH 3/4] Make process to update launchpad easier. --- build/launchpad/README | 48 +++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/build/launchpad/README b/build/launchpad/README index 03ddc7fd4e6..b2db1d18894 100644 --- a/build/launchpad/README +++ b/build/launchpad/README @@ -41,23 +41,21 @@ If you want to build/test package locally: # Push/declare Dolibarr sources to Launchpad #---------------------------------- - From Launchpad project (https://launchpad.net/dolibarr), register a series: - Call it 'trunk' or 'beta' or 'stable' + Call it 'trunk' or 'stable' Use branch (dev): - ~eldy/dolibarr/develop - ~eldy/dolibarr/beta - ~eldy/dolibarr/stable + https://launchpad.net/~eldy/dolibarr/develop + https://launchpad.net/~eldy/dolibarr/stable or - Use URL pattern (beta or stable): + Use URL pattern (stable): For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz - For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz - For Dev, you can also add link serie to GIT HEAD. -- For beta and stable, you can init from command line - cd bzr/dolibarr-[beta|stable] +- For stable, you can init from command line + cd bzr/dolibarr-stable bzr init bzr add bzr commit -m "Init" - bzr push lp:~yourlogin/dolibarr/[beta|stable] + bzr push lp:~yourlogin/dolibarr/stable - List of series are visible here: https://launchpad.net/dolibarr/+series @@ -65,19 +63,19 @@ If you want to build/test package locally: #---------------------------------- # create local repository cd bzr - bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable] - cd dolibarr-[dev|beta|stable] + bzr branch lp:~yourlogin/dolibarr/[develop|stable] dolibarr-[dev|stable] + cd dolibarr-[dev|stable] # Update bzr update - -- Update files here. Remove all and overwrite -- + -- Update files here: Remove all (except .bzr dir) and overwrite -- bzr status bzr add * - bzr commit -m "Description of change" + bzr commit -m "Upstream version x.y" bzr push # Init debian dir repository into launchpad (when repository for sources does not exist) #---------------------------------- -- Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable] +- Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|stable] cd bzr mkdir debian cd debian @@ -85,25 +83,25 @@ If you want to build/test package locally: bzr init bzr add bzr commit -m "Init control files" - bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable] (put here any branch name or just bzr push if into a known branch) + bzr push lp:~yourlogin/+junk/debian-[dev|stable] (put here any branch name or just bzr push if into a known branch) - or download it from launchpad bazaar: cd bzr - bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable] + bzr branch lp:~yourlogin/+junk/debian-[dev|stable] # Get debian dir repository from launchpad (when repository for sources already exists) #---------------------------------- cd bzr - bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable] + bzr branch lp:~yourlogin/+junk/debian-[dev|stable] # To update debian dir into launchpad (when repository for sources already exists) #---------------------------------- cd bzr - bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable] - cd debian-[dev|beta|stable] + bzr branch lp:~yourlogin/+junk/debian-[dev|stable] + cd debian-[dev|stable] bzr status -- Update files here -- bzr commit -m "Description of change" - bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable] + bzr push lp:~yourlogin/+junk/debian-[dev|stable] # Define a recipe into launchpad (a rule to build packages into a PPA) @@ -115,10 +113,6 @@ If you want to build/test package locally: # bzr-builder format 0.3 deb-version {debupstream}-0~{revno} lp:dolibarr merge packaging lp:~yourlogin/+junk/debian-dev - For beta: - # bzr-builder format 0.3 deb-version {debupstream}-1~{revno} - lp:dolibarr/beta - merge packaging lp:~yourlogin/+junk/debian-beta For stable: # bzr-builder format 0.3 deb-version {debupstream}-2~{revno} lp:dolibarr/stable @@ -126,13 +120,12 @@ If you want to build/test package locally: - Run command cd bzr bzr dailydeb dolibarr.recipe working-dir - This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|beta|stable] + This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|stable] - Test package sources sudo pbuilder build /_.dsc List of recipes created https://code.launchpad.net/~eldy/+recipe/dolibarr-dev -https://code.launchpad.net/~eldy/+recipe/dolibarr-beta https://code.launchpad.net/~eldy/+recipe/dolibarr-stable @@ -147,9 +140,6 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable For the development snapshot version: deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main -For the beta version: -deb http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main -deb-src http://ppa.launchpad.net/yourlogin/dolibarr-beta/ubuntu precise main For the stable version: deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main From 8febf25c2360904d47362e87fe1da33a185265c2 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 3 Oct 2015 23:34:10 +0200 Subject: [PATCH 4/4] Fix: #3566 --- htdocs/fourn/class/fournisseur.facture.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index ed81f486dc1..6a209174d9f 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2013 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Marcos García @@ -986,8 +986,8 @@ class FactureFournisseur extends CommonInvoice $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($num); - $dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoive_supplier').$oldref; - $dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoive_supplier').$newref; + $dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$oldref; + $dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref; if (file_exists($dirsource)) { dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); @@ -996,7 +996,7 @@ class FactureFournisseur extends CommonInvoice { dol_syslog("Rename ok"); // Rename docs starting with $oldref with $newref - $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoive_supplier').$newref, 'files', 1, '^'.preg_quote($oldref,'/')); + $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2,0,0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref,'/')); foreach($listoffiles as $fileentry) { $dirsource=$fileentry['name'];
'; print $langs->trans('Source'); @@ -1988,6 +1990,8 @@ if ($action == 'create' && $user->rights->commande->creer) // print ''.$langs->trans("DictionarySource").''; print '