Fix: Upgrade of package break install

Conflicts: build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec
Fix: rpm packages
2025-12-05 09:08:09 +01:00 · 2013-07-24 13:49:40 +02:00 · 2013-07-24 13:46:50 +02:00 · 2013-07-14 20:29:25 +02:00 · 2013-07-14 20:29:07 +02:00 · 2013-07-09 15:27:06 +02:00
3082 changed files with 241528 additions and 144783 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ htdocs/conf/conf.php.old
 documents/
 custom/
 custom2/
+test/
 nbproject
 default.properties
 .settings/
--- a/975
+++ b/975
--- a/65
+++ b/65
@@ -3,33 +3,36 @@ License
 -------

 Dolibarr is released under the terms of the GNU General Public License as 
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version
+published by the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version (GPL-3+).
+More information: http://www.gnu.org/licenses/gpl-3.0.txt

-However it uses some external libraries under different licences. This is compatibility summary:
+Dolibarr uses some external libraries released under different licences. This is compatibility summary:

 Composant         Version  License                     Compatible GPL   Usage
 ----------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date        0.21		Modified BSD License		Yes				Date convertion (not into rpm package)
-CKEditor		  3.6.2		GPL or LGPL 2.1 or MPL 1.1	Yes				Editor WYSIWYG
-FPDI              1.4.1		Apache Software License 2.0	?				PDF templates management
-GeoIP			  2004      LGPL 2.1                    Yes             Sample code to make geoip convert (not into deb package)
-NuSoap            0.9.5		LGPL 2.1					Yes				Library to develop SOAP Web services (not into rpm and deb package)
-OdtPHP            1.0.1		GPL 2.0						Yes				Library to build/edit ODT files
-PHPExcel		  1.7.6		LGPL 2.1					Yes				Read/Write XLS files, read ODS files
-TCPDF             5.9.098	LGPL 3.0					Yes				PDF generation
+CKEditor		  3.6.4		LGPL-2.1+					Yes				Editor WYSIWYG
+FPDI              1.4.2		Apache Software License 2.0	Yes				PDF templates management (with FPDF_TPL 1.2)
+GeoIP			  2004      LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap            0.9.5		LGPL 2.1+					Yes				Library to develop SOAP Web services (not into rpm and deb package)
+OdtPHP            1.0.1		GPL-2+						Yes				Library to build/edit ODT files
+PHPExcel		  1.7.6		LGPL-2.1+					Yes				Read/Write XLS files, read ODS files
+TCPDF             5.9.180	LGPL-3+						Yes				PDF generation

 JS libraries:
-jQuery            1.7.1		GPL and MIT Licence			Yes				JS library
-jQuery UI         1.8.17	GPL and MIT Licence			Yes				JS library plugin UI
+jQuery            1.8.2		MIT Licence					Yes				JS library
+jQuery UI         1.9.1		GPL and MIT Licence			Yes				JS library plugin UI
+jQuery Timepicker 1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
 jQuery Colorpicker 1.1	    MIT Licence					Yes				JS library for color picker for a defined list of colors
-jQuery DataTable  1.8.1     BSD							Yes				JS library for tables output
+jQuery DataTables 1.9.1     BSD							Yes				JS library for tables output
 jQuery Flot       0.7		MIT Licence					Yes				JS library to build graph
 jQuery FileUpload 5.0.3		GPL and MIT Licence			Yes				JS library to upload files
 jQuery JCrop      0.9.8		GPL and MIT Licence			Yes				JS library plugin Crop (to crop images)
 jQuery jeditable  1.7.1		GPL and MIT Licence			Yes				JS library plugin jeditable (to edit in place)
-jQuery jNotify	  1.1.00	Apache Software License 2.0	?				JS library plugin jNotify (to use ajax popups)
+jQuery jNotify	  1.1.00	Apache Software License 2.0	Yes				JS library plugin jNotify (to use ajax popups)
+jQuery blockUI    2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery jPicker	  1.1.00	GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
 jQuery Layout     1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
 jQuery TableDnD   0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
@@ -37,7 +40,6 @@ jQuery Mobile	  1.0rc2	GPL and MIT Licence			Yes				JS library for smartphone (n
 jQuery Tiptip     1.3		GPL and MIT Licence			Yes				JS library for tooltips
 JSGantt           1.2		BSD Licence					Yes				JS library (to build Gantt reports)

-
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html

@@ -45,50 +47,65 @@ http://www.fsf.org/licensing/licenses/index_html
 Copyright
 ---------

-Copyright (C) 2012
+Copyright (C) 2013
+- Christophe Battarel <christophe.battarel@altairis.fr>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin	<regis@dolibarr.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
+
+Copyright (C) 2012
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Marcos García <marcosgdf@gmail.com>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin	<regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- Nicolas Péré <nicolas@amarok2.net>

 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin	<regis@dolibarr.fr>
+- Regis Houssin	<regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>

 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>
 - r2gnl
 - meos

 Copyright (C) 2009
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Juanjo Menent <jmenent@2byte.es>

 Copyright (C) 2008
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2007
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Auguria SARL <info@auguria.org>
 - Jean Heimburger <jean@tiaris.info>
+- Jeremie Ollivier <jeremie.o@laposte.net>

 Copyright (C) 2006
 - Auguria SARL <info@auguria.org>
 - Marc Barilley/Ocebo <marc@ocebo.com>
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
 - Andre Cianfarani <acianfa@free.fr>
 - Yannick Warnier <ywarnier@beeznest.org>
 - Jean Heimburger <jean@tiaris.info>
@@ -100,7 +117,7 @@ Copyright (C) 2005
 - Rodolphe Quiedeville <rodolphe@quiedeville.org>
 - Eric Seigne <erics@rycks.com>
 - Matthieu Valleton <mv@seeschloss.org>
- Regis Houssin <regis@dolibarr.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>

 Copyright (C) 2004
 - Laurent Destailleur  <eldy@users.sourceforge.net>
--- a/259
+++ b/259
@@ -2,11 +2,233 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------

-***** ChangeLog for 3.3 compared to 3.2 *****
+***** ChangeLog for 3.3.3 compared to 3.3.2 *****
+
+- Fix: [ bug #903 ] Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
+- Fix: [ bug #934 ] Error on proformat invoice creation (pgsql)
+- Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
+
+***** ChangeLog for 3.3.2 compared to 3.3.1 *****
+
+- Fix: Dutch (nl_NL) translation
+- Generalize fix: file with a specific mask not found, again
+- Fix: translations and BILL_SUPPLIER_BUILDDOC trigger
+- Fix: Can't reset payment due date
+- Fix: Orderstoinvoice didn't act as expected when no order was checked
+- Fix: Bad link to all proposals into Third party card if customer is prospect
+- Fix: Some bugs on withdrawal rejects
+- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed
+- Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on payment
+- Fix: [ bug #789 ] VAT not being calculated in POS
+- Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated
+- Fix: [ bug #794 ] Lost filter on zipcode in prospect list 
+- Fix: [ bug #806 ] Margins module with orders2invoice does not respect cost price
+- Fix: [ bug #810 ] Cannot update ODT template path
+- Fix: [ bug #816 ] Sales journal does not reflect localtaxes
+- Fix: [ bug #817 ] Purchases journal does not reflect localtaxes
+- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
+- Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
+- Fix: [ bug #855 ] Holiday approval email in French
+- Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
+- Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
+- Fix: [ bug #861 ] Impossible to create a new event in agenda
+- Fix: [ bug #827 ] AJAX search does not respect multiprice level
+- Fix: [ bug #865 ] Dolibarr navigation array in project/task do not work
+- Fix: [ bug #866 ] Standing order from an invoice suggests invoice total amount instead of remaining to pay
+- Fix: [ bug #788 ] Date of linked interventions are not shown
+- Fix: external users should not see costprice and margin infos
+- Fix: [ bug #806 ] Tasks are ordered alphabetically instead of chronological order
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+- Fix: [ bug #762 ] Bad profit calculation in Reporting
+- Fix: bug dictionnary with wrong prefix table



-***** ChangeLog for 3.2 compared to 3.1 *****
+***** ChangeLog for 3.3 compared to 3.2.3 *****
+For users:
+- New: Add holiday module, to declare and follow holidays of your employees.
+- New: Add margin management module.
+- New: Add new theme Amarok.
+- New: [ task #289 ] Can reorder tasks.
+- New: Add field "signature" into user card. If filled, text is added 
+       at end of predefined email texts. If option MAIN_MAIL_DO_NOT_USE_SIGN is on, this
+       feature is disabled.
+- New: Can input a payment back onto an credit note.
+- New: Add link "Back to list" on all cards.
+- New: After first install, warning are visible onto mandatory setup not
+       configured. Show also total number of activated modules.
+- New: Can filter list of proposal, order or invoice on sales representative.
+- New: Add supplier ref on supplier orders.
+- New: Can export supplier orders and customers shipments.
+- New: First change to install external plugins from gui (experimental). 
+- New: Monaco is like France for default vat calculation
+- New: Can list elements (invoices, orders or proposals) on a particular
+  user contact). This allow to view a "basket" of its elements.
+- New: Show bank account on payment list of invoice card.
+- New: Cloning project allow to clones task, notes, files, contacts. 
+- New: Enhance default style.
+- New: Can edit and resiliate member status from list.
+- New: Can insert URL links into elements lines. Also reported into PDF.
+- New: When a member is validated, we can subscribe to mailing-lists
+       according to its type.
+- New: Add a tab into members statistics to count members by nature.
+- New: Add link to third party into sells and purchase journal.
+- New: Suggest a method to generate a backup file for user with no access
+       to mysqldump binary.
+- New: Can also use extrafields on contacts/addresses and users.
+- New: Support unique field for extrafields.
+- New: Extra fields supports more types (int, string, double, date, datetime).
+- New: Can correct stock of a warehouse from warehouse card.
+- New: [ task #185 ] Can input amount when correcting stock to recalculate PMP.
+- New: [ task #454 ] Add "No category" into filters on category.
+- New: Auto check box on page to edit interface options of user.
+- New: More surface control on stock correction page.
+- New: Add great britain provinces.
+- New: [ task #494 ] Send an email to foundation when a new member has auto-subscribed.
+- New: [ task #326 ] Add a numbering module to suggest automatically a product ref.
+- New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates.
+- New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
+- New: Can select thirdparties into emailing targets, even if module category is not enabled.
+- New: [ task #498 ] Improvement of the block to add products/services lines.
+- New: ECM autodir works also for files joined to products and services.
+- New: Add a selection module for emailing to enter a recipient from gui.
+- New: Allow to search thirds and products from barcodes directly from the permanent mini search left box.
+- New: Allow to search product from barcodes directly from invoices, proposals... through AJAX.
+- New: Can make one invoice for several orders.
+- New: POS module can works with only one payment method (cach, chq, credit card).
+- New: Add possibility to defined position/job of a user.
+- New: Add hidden option to add slashes between lines into PDF.
+- New: [ task #210 ] Can choose cash account during POS login.
+- New: [ task #104 ] Can create an invoice from several orders.
+- New: Update libs/tools/logo for DoliWamp (now use PHP 5.3).
+- New: Added ODT Template tag {object_total_discount_ht}
+- New: Add new import options: Third parties bank details, warehouses and stocks, categories and suppliers prices
+- New: English bank account need a bank code (called sort code) to identify an account. 
+- New: Can choose menu entry to show with external site module.
+- New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of generated PDF.
+- New: [ task #314 ] Can define if prof id are mandatory or not.
+- New: Add button on order card to create intervention from services.
+- New: Add search box to find products by supplier reference.
+- New: Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. 
+- New: [ task #608 ] Can clone a supplier order with prices updates
+- New: [ task #559 ] Can define a discount % regarding quantity in supplier prices and price by quantity in customer prices
+- New: [ task #527 ] After cloning a suplier invoice, go onto invoice ref into edit mode
+
+New experimental module:
+- New: Add commissions management module.
+
+- Fix: [ bug #499 ] Supplier order input method not translated
+- Fix: No images into product description lines as PDF generation does not work with this.
+- Fix: Errors weren't being shown in customer's & supplier's orders
+- Fix: Lastname wasn't being recorded in xinputuser emailing module.
+- Fix: [ bug #653 ] Error while creating agenda additional attributes
+- Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
+- Fix: [ bug #658 ] Search on bank do not work for description
+- Fix: [ bug #659 ] Comment in recurrent invoices is not stored
+- Fix: [ bug #622 ] Attaching wrong file when sending the invoice via e-mail
+
+For developers:
+- New: Add webservice for thirdparty creation and list.
+- New: A module can overwrite templates parts.
+- New: Can add a link on title field of added dictionnary.
+- New: Uniformize code.
+- New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and 
+       WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER.
+- New: A module can add several css and js.
+- New: removed deprecated methods
+       ldap::connect, formadmin::select_lang,
+       html::select_tva
+- New: Add custom substitution function for ODT product lines: mymodule_completesubstitutionarray_lines()
+- New: Basic implementation of hooks and triggers for a lot (most) of core modules: 
+  action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines, 
+  expedition, order supplier and order invoice (lines included), intervention card, project, tasks.
+- New: Add ChromePHP output into syslog module.
+- New: Add PRODUCT_PRICE_MODIFY trigger.
+- New: Created function to retrieve total amount of discount of an invoice/proposal...
+- New: We can use a dynamic value ($conf->global->XXX for example) into titles of menus.
+- New: Use PHP classes DateTime* for some data functions instead of adodb 
+- Qual: Renamed SUPPLIER_INVOICE_BUILDDOC trigger to BILL_SUPPLIER_BUILDDOC
+- Qual: Renamed INVOICE_SUPPLIER_DELETE trigger to BILL_SUPPLIER_DELETE
+- Qual: Renamed SUPLIER_ORDER_BUILDDOC trigger to ORDER_SUPPLIER_BUILDDOC
+- Qual: Renamed CONTRACTLINE_DELETE trigger to CONTRACT_LINE_DELETE
+- Qual: Renamed all ficheinter.class.php triggers so that they start with 'FICHINTER_'
+- Fix: [ bug #655 ] ORDER_REOPEN trigger incorrectly named
+- Fix: [ bug #656 ] Contracts trigger CONTRACT_MODIFY incorrectly named
+- Fix: [ bug #657 ] Usergroup class' GROUP_DELETE trigger incorrectly named
+
+For translators:
+- New: Update language files (de, tr, pt, ca, es, en, fr).
+- New: Added bg_BG autotranslated language.
+- New: Translate the donation receipt.
+
+Dolibarr license has also been updated from GPLv2+ to GPLv3+.
+
+
+
+***** ChangeLog for 3.2.3 compared to 3.2.2 *****
+
+- Fix: Some permission into agenda module.
+- Fix: Generation of PDF was not using correct font for some languages.
+- Fix some translations.
+- Fix: [ bug #607 ] Nom de société avec guillemets.
+- Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not
+  complete.
+- Fix: comaptiblity with multicompany module.
+- Fix: Bad label when validating/paying an invoice from POS module.
+- Fix: Correct recipient into rouget template.
+- Fix: A lot of fix into PDF pagebreak management.
+- Update VAT for some countries.
+- Firstname was missing when sending email from file list.
+- Added en_SA language.
+
+
+
+***** ChangeLog for 3.2.2 compared to 3.2.1 *****
+- Fix: Modify spanish VAT to new rates.
+- Fix: Add error message when creating already existing product.
+- Fix: Edition of percentage of an event.
+- Fix: Minor look fix for theme bureau2crea.
+- Fix: Start and end date not saved at project creation
+- Fix: Default vat is zero for customer invoices if company does not use vat
+- Fix: Localtaxes unit prices precision
+
+
+
+***** ChangeLog for 3.2.1 compared to 3.2.0 *****
+- Fix: Edit of projects.
+- Fix: Activation of modules does not fails if directory install was removed.
+- Fix: [ bug #444 ] Regression on auto-closing for proposals and orders.
+- Fix: Update translations (catalan, french, spanish, brazilian).
+- Fix: [ bug #445 ] Hex escaping in descriptions.
+- Fix: error when validating shipment for non predefined products with a
+  selected warehouse.
+- Fix: Bad local taxes if price base type is TTC for spanish local taxes.
+- Fix: Phone not saved when using web service.
+- Fix: [ bug #464 ] Payment form should allow to add transmitter for bank transfers.
+- Fix: Allows to use a comma decimal separator in supplier invoices payments.
+- Fix: Translation for tr_TR, es_ES, pt_BR.
+- Fix: Products with no prices not visible.
+- Fix: Access to product card created with very old version of Dolibarr.
+- Fix: Delete temporary files after validating an invoice.
+- Fix: preview of supplier order and invoice template.
+- Fix: [ bug #485 ] Configurated amount for public auto-subscription form is not taken into account
+- Fix: Average amount graphs weren't comparing the previous year stats
+- Fix: Closed project didn't show the new status unless the page was refreshed
+- Fix: Files were not being uploaded to a project's task
+- Fix: [ bug #503 ] Unable to delete linked file to a deposit
+- Fix: [ bug #501 ] Error while trying to modify an user
+- Fix: [ bug #506 ] Can't set percentage of a started event
+- Fix: Bad assignation of const for pdf delivery module name
+
+
+
+***** ChangeLog for 3.2.0 compared to 3.1.3 *****
 WARNING: PHP lower than 5.x are no more supported.
 WARNING: Because of a major datastructure change onto supplier prices tables, be aware
 to make a backup of your database before making upgrade.
@@ -14,7 +236,7 @@ to make a backup of your database before making upgrade.
 For users:
 - New: Each user can remove/add its own boxes.
 - New: Add signature at end of predefined email text.
- New: Can use personalized fields of products/services.
+- New: Can use personalized fields on products/services.
 - New: Can attach files on social contributions.
 - New: Show payments terms and conditions onto muscadet template.
 - New: Can open back a closed commercial proposal.
@@ -32,7 +254,7 @@ For users:
 - New: task #10606 : more comprehensive message error.
 - New: task #11278 : Option into point of sale module to add services in list.
 - New: task #11261 : Add an entry into menu called "New shipment".
- New: [ task #187 ] Gerer les evenement recurrents dans les imports ical
+- New: [ task #187 ] Gerer les evenement recurrents dans les imports ical.
 - New: Make option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT available by default.
 - New: Can build PDF in USLetter format or canada format (change paper size).
 - New: Can export into Excel 2007 format.
@@ -47,7 +269,7 @@ For users:
 - New: Reduce seriously size of packages.
 - New: Can define country code for import.
 - New: When invoice was generated from order, order date is visible on PDF, after order ref.
- New: [ task #181 ] Hide password of click2dial in user card
+- New: [ task #181 ] Hide password of click2dial in user card.
 - New: Chart are faster to build
 - New: Value of data into charts are visible on mouse hover.
 - New: Import wizard can import contacts.
@@ -70,6 +292,10 @@ For users:
 - Fix: Can use POS module with several concurrent users.
 - Fix: Installer don't fails with Mysql version that added a ssl_cypher field.
 - Fix: Sanitize input parameters.
+- Fix: [ bug #368 ] Product list
+- Fix: [ bug #370 ] Filter in accountancy -> suppliers_bills
+- Fix: [ bug #399 ] Bad calculation of local taxes in update line products
+- Fix: [ bug #427 ] Bad links to wiki help in certains menus

 For developers:
 - New: Can add a left menu into an existing top menu or left menu.
@@ -98,6 +324,29 @@ For developers:
 WARNING: To reduce technic debt, all functions dolibarr_xxx were renamed int dol_xxx.


+
+***** ChangeLog for 3.1.3 compared to 3.1.2 *****
+
+Fix: PgSQL - property must be set if success
+Fix: Provide a solution for backup when mysqldump is not available
+Fix: Bug #460 - Wrong entity assignment when creating a warehouse
+Fix: bug #405 - Late icon always displayed on comm/propal.php
+
+
+
+***** ChangeLog for 3.1.2 compared to 3.1.1 *****
+
+- Fix: Can clone a proposal
+- Fix: Add member ID in substitution method
+- Fix: Duplicate end tag and missing form parts
+- Fix: Support companies with no prof id.
+- Fix: Sanitize data
+- Fix: Bug #318
+- Fix: Bug #369
+- Fix: More bugs
+
+
+
 ***** ChangeLog for 3.1.1 compared to 3.1.0 *****

 - New: Add option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS. With this option added, 
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 INSTALL
 -------

-English:     See file README.
+English:     See README file.

 French:      Voir fichier README-FR.
--- a/2
+++ b/2
@@ -108,7 +108,7 @@ Other modules:
 - RSS

 Miscellanous:
- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office,
  with a particular menu, or by external users, as a front-office, with
  another menu and permissions).
--- a/2
+++ b/2
@@ -122,7 +122,7 @@ V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Pas de compta analytique (uniquement gestion de trésorerie).
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
+- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Ne gère pas la double tva (Fédérale / provinciale) du canada.
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
--- a/README.md
+++ b/README.md
@@ -3,6 +3,13 @@
 Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.


+
+## LICENSE
+
+Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
+
+
+
 ## INSTALL

 If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensue, Mandriva or Mageia).
@@ -98,7 +105,7 @@ See ChangeLog file found into package.

 ### Miscellanous:

- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions).
 - Very user friendly and easy to use.
 - Optional WYSIWYG forms, optional Ajax forms.
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,7 @@
  <parallel>
   <!-- <antcall target="phpmd"/> -->
   <antcall target="phpcpd"/>
-   <antcall target="phpcs"/>
+   <!-- <antcall target="phpcs"/> -->
   <antcall target="doxygen"/>
   <antcall target="phploc"/>
  </parallel>
@@ -69,9 +69,10 @@
   
 <!-- Generate checkstyle.xml -->
 <target name="phpcs">
-  <exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
+  <exec executable="phpcs" dir="${basedir}">
    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
    			--report=checkstyle
+    			--report-file=${basedir}/hudson/logs/checkstyle.xml
                --ignore=${ignorepaths},${ignoreregexp}
                htdocs
                "/>
@@ -97,5 +98,5 @@
  </exec>
 </target>

- <target name="hudson" depends="clean,phpunit,parallelTasks"/>
+ <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
 </project>
--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
@@ -56,7 +56,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text>
-				<name>GPLv2</name>
+				<name>GPL-3.0+</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
@@ -57,7 +57,7 @@ standalone software. Dolibarr is designed to provide simplicity to end-user.
 		<!-- Service presentation properties (step 7) -->
 		<license must-accept="false">
 			<text xml:lang="">
-				<name>GPLv2</name>
+				<name>GPL-3.0+</name>
 				<file>COPYING</file>
 			</text>
 		</license>
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -8,14 +8,12 @@ script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).

 # To build a debian package, you need first
-# apt-get -i debhelper 
-# apt-get -i dpkg-source 
-# apt-get -i gpg
+# apt-get -i debhelper dpkg-source gpg lintian


 # This is standard command to work on Debian packaging:
 #
-# gpg --gen-key                          Generate a GPG key
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
 #
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
@@ -35,7 +33,8 @@ with format .DEB (for Debian, Ubuntu, ...).
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
-
+#
+# gdebi package.deb						 Install a package + dependencies

 To submit a package to Debian:

@@ -44,10 +43,11 @@ To submit a package to Debian:
 See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.

 - Wait until you received bug number.
-For first ITP submission of Dolibarr, bug id was 634783.
+  For first ITP submission of Dolibarr, bug id was 634783.

- Check bug is into database by searching with id on http://www.debian.org/Bugs/
- 
+- Check bug is into database by searching with id on 
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  
 - Add a line for upstream into file changelog with bug number

 - Call for a mentor on ML debian-mentors to upload packages
--- a/build/debian/apache.conf
+++ b/build/debian/apache.conf
@@ -34,16 +34,6 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
  </IfModule>


-    # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
-    # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
-    #AddType text/javascript .jgz
-    #AddEncoding gzip .jgz
-    
-    # OPTIMIZE: To use gzip compression (on the fly).
-    # Note that you must also enable the module mod_deflate.
-    # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
-    #TODO
-    
    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
    # Note that you must also enable the module mod_expires.
    #ExpiresActive On
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,9 +1,9 @@
-dolibarr (3.3.0+nmu1) unstable; urgency=low
+dolibarr (3.3.3+nmu1) unstable; urgency=low

  * Non-maintainer upload.
  * New upstream release.
    closes: bug#634783
    
- -- Dolibarr team <contact@dolibarr.org>  Mon, 10 Aug 2011 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     

-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -161,12 +161,11 @@ $dolibarr_main_authentication='dolibarr';
 # $dolibarr_main_auth_ldap_filter = '';                        # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
 # $dolibarr_main_auth_ldap_admin_login='';					# Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
 # $dolibarr_main_auth_ldap_admin_pass='';					# Required only if anonymous bind disabled. Ex: secret
-
 # $dolibarr_main_auth_ldap_debug='false';


 # dolibarr_main_demo
-# Login and pass to use in a demo mode
+# Login and pass to use in a demo mode.
 # Default value: ''
 # Examples:
 # $dolibarr_main_demo='autologin,autopass'
--- a/build/debian/control
+++ b/build/debian/control
@@ -9,10 +9,8 @@ Build-Depends: debhelper (>= 7), po-debconf, dpatch
 Package: dolibarr
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
    php5-mysql | php5-mysqli, 
-    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, php-fpdf,
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
 	libphp-adodb,
-    libfpdi-php,
-    libfpdf-tpl-php,
    libnusoap-php,
    libphp-pclzip,
    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
--- a/build/debian/control.debianbin
+++ b/build/debian/control.debianbin
@@ -1,55 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-mysql | php5-mysqli, 
-    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
-    libnusoap-php,
-    libphp-pclzip,
-    libfpdi-php,
-    libfpdf-tpl-php,
-    ckeditor,
-    ttf-dejavu-core,
-    xdg-utils,
-    mysql-server
-Section: web
-Priority: optional
-Homepage: http://www.dolibarr.org
-Description: Web based software to manage a small company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software for small 
- and medium companies, foundations or freelances. It includes different 
- features for Enterprise Resource Planning (ERP) and Customer Relationship
- Management (CRM) but also for different other activities.
- It's a web software you can install as a standalone program or on any web
- hosting provider to use it from anywhere with any web browser.
- .
- Dolibarr was designed to be easy to use. Only features you need are 
- visible, depending on which module were activated.
- .
- Customers, Suppliers or Prospects directory,
- Contacts directory,
- Orders management,
- Commercial proposals management,
- Invoices management,
- Products and services catalog,
- Stock management,
- Foundations members management,
- Bank accounts management,
- Point of Sale,
- Payments management,
- Commercial actions management,
- Contracts management,
- Standing orders management,
- Shipping management,
- Donations management,
- Bookmarks management,
- Mass Emailings,
- Reports,
- Wizards to export and import data,
- LDAP connectivity,
- PDF exports,
- And a lot of more modules...
- .
- You can also add third parties external modules or develop yours.
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -6,9 +6,9 @@ Source: git@github.com:Dolibarr/dolibarr.git
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
-           2003-2012, Laurent Destailleur    <eldy@users.sourceforge.net>
+           2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
           2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2012, Regis Houssin          <regis@dolibarr.fr>
+           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
           2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
           2004, Benoit Mortier              <benoit.mortier@opensides.be>
           2004, Christophe Combelles        <ccomb@free.fr>
@@ -31,18 +31,18 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
           2008, Matteli                     <unknown@unknown.com>
           2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
           2010, Francois Legastelois        <flegastelois@teclib.com>
-           2010-2012, Juanjo Menent          <jmenent@2byte.es>
-           2010-2012, Philippe Grand         <philippe.grand@atoo-net.com>
+           2010-2013, Juanjo Menent          <jmenent@2byte.es>
+           2010-2013, Philippe Grand         <philippe.grand@atoo-net.com>
           2010, Pierre Morin                <pierre.morin@auguria.net>
           2010, Servitux Servicios Informaticos <info@servitux.es>
           2011, Herve Prot                  <herve.prot@symeos.com>
           2011, Remy Younes                 <ryounes@gmail.com>
-           2012, Christophe Battarel         <christophe.battarel@altairis.fr>
-License: GPL-2+
+           2012-2013, Christophe Battarel         <christophe.battarel@altairis.fr>
+License: GPL-3+
 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 the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
+ version 3 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope that it will be
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -83,8 +83,9 @@ case "$1" in
 		chown -R root:www-data $installconfig
 	   	chmod -R 660 $installconfig

-		if [ ! -s $config ]
-		then 
+		# If a conf already exists and its content was already completed by installer
+		if [ ! -s $config ] || ! grep -q "File generated by" $config
+		then
 			# Create an empty conf.php with permission to web server
 			echo Create empty file $config		
 			touch $config
@@ -93,17 +94,17 @@ case "$1" in
 		else
 			# File already exist. We add params not found.
 			echo Add new params to overwrite path to use shared libraries/fonts
-			grep -q -c "dolibarr_lib_ADODB_PATH" $config || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
-			grep -q -c "dolibarr_lib_FPDI_PATH" $config || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
-			grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
-			grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
-			grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
-			grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-			grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-			grep -q -c "dolibarr_js_CKEDITOR" $config || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY" $config || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY_UI" $config || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-			grep -q -c "dolibarr_js_JQUERY_FLOT" $config || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+			grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+			grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+			#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+			grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+			grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+			#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+			#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+			grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
 			grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 		fi
 	
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@@ -3,7 +3,8 @@
 #
 # see: dh_installdeb(1)

-set -e
+#set -e
+set +e

 # summary of how this script can be called:
 #        * <postrm> `remove'
@@ -179,11 +180,17 @@ case "$1" in

 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
-				echo postrm Database login $dbuser removed
+				echo postrm Database login $dbuser@localhost removed
 			else
 			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
+			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
+				echo postrm Database login $dbuser@% removed
+			else
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
+				echo postrm $error
+			fi

 		    # Now run the drop commands
 		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
--- a/build/debian/dolibarr.xpm
+++ b/build/debian/dolibarr.xpm
@@ -1,292 +1,196 @@
 /* XPM */
 static char * dolibarr_xpm[] = {
-"32 32 257 2",
+"32 32 161 2",
 "  	c None",
-". 	c #000000",
-"+ 	c #800080",
-"@ 	c #000080",
-"# 	c #008080",
-"$ 	c #008000",
-"% 	c #808000",
-"& 	c #800000",
-"* 	c #C0C0C0",
-"= 	c #C0DCC0",
-"- 	c #A6CAF0",
-"; 	c #808080",
-"> 	c #FF00FF",
-", 	c #0000FF",
-"' 	c #00FFFF",
-") 	c #00FF00",
-"! 	c #FFFF00",
-"~ 	c #FF0000",
+". 	c #4378AA",
+"+ 	c #4277A8",
+"@ 	c #4175A7",
+"# 	c #3F74A5",
+"$ 	c #3E72A3",
+"% 	c #3D71A2",
+"& 	c #487AA8",
+"* 	c #5A87B0",
+"= 	c #5987B0",
+"- 	c #5986B0",
+"; 	c #5583AE",
+"> 	c #4678A6",
+", 	c #326A9D",
+"' 	c #356C9F",
+") 	c #3B70A1",
+"! 	c #3B6FA0",
+"~ 	c #90ADC9",
 "{ 	c #FFFFFF",
-"] 	c #FFFBF0",
-"^ 	c #A0A0A4",
-"/ 	c #402000",
-"( 	c #602000",
-"_ 	c #802000",
-": 	c #A02000",
-"< 	c #C02000",
-"[ 	c #E02000",
-"} 	c #004000",
-"| 	c #204000",
-"1 	c #404000",
-"2 	c #604000",
-"3 	c #804000",
-"4 	c #A04000",
-"5 	c #C04000",
-"6 	c #E04000",
-"7 	c #006000",
-"8 	c #206000",
-"9 	c #406000",
-"0 	c #606000",
-"a 	c #806000",
-"b 	c #A06000",
-"c 	c #C06000",
-"d 	c #E06000",
-"e 	c #008000",
-"f 	c #208000",
-"g 	c #408000",
-"h 	c #608000",
-"i 	c #808000",
-"j 	c #A08000",
-"k 	c #C08000",
-"l 	c #E08000",
-"m 	c #00A000",
-"n 	c #20A000",
-"o 	c #40A000",
-"p 	c #60A000",
-"q 	c #80A000",
-"r 	c #A0A000",
-"s 	c #C0A000",
-"t 	c #E0A000",
-"u 	c #00C000",
-"v 	c #20C000",
-"w 	c #40C000",
-"x 	c #60C000",
-"y 	c #80C000",
-"z 	c #A0C000",
-"A 	c #C0C000",
-"B 	c #E0C000",
-"C 	c #00E000",
-"D 	c #20E000",
-"E 	c #40E000",
-"F 	c #60E000",
-"G 	c #80E000",
-"H 	c #A0E000",
-"I 	c #C0E000",
-"J 	c #E0E000",
-"K 	c #000040",
-"L 	c #200040",
-"M 	c #400040",
-"N 	c #600040",
-"O 	c #800040",
-"P 	c #A00040",
-"Q 	c #C00040",
-"R 	c #E00040",
-"S 	c #002040",
-"T 	c #202040",
-"U 	c #402040",
-"V 	c #602040",
-"W 	c #802040",
-"X 	c #A02040",
-"Y 	c #C02040",
-"Z 	c #E02040",
-"` 	c #004040",
-" .	c #204040",
-"..	c #404040",
-"+.	c #604040",
-"@.	c #804040",
-"#.	c #A04040",
-"$.	c #C04040",
-"%.	c #E04040",
-"&.	c #006040",
-"*.	c #206040",
-"=.	c #406040",
-"-.	c #606040",
-";.	c #806040",
-">.	c #A06040",
-",.	c #C06040",
-"'.	c #E06040",
-").	c #008040",
-"!.	c #208040",
-"~.	c #408040",
-"{.	c #608040",
-"].	c #808040",
-"^.	c #A08040",
-"/.	c #C08040",
-"(.	c #E08040",
-"_.	c #00A040",
-":.	c #20A040",
-"<.	c #40A040",
-"[.	c #60A040",
-"}.	c #80A040",
-"|.	c #A0A040",
-"1.	c #C0A040",
-"2.	c #E0A040",
-"3.	c #00C040",
-"4.	c #20C040",
-"5.	c #40C040",
-"6.	c #60C040",
-"7.	c #80C040",
-"8.	c #A0C040",
-"9.	c #C0C040",
-"0.	c #E0C040",
-"a.	c #00E040",
-"b.	c #20E040",
-"c.	c #40E040",
-"d.	c #60E040",
-"e.	c #80E040",
-"f.	c #A0E040",
-"g.	c #C0E040",
-"h.	c #E0E040",
-"i.	c #000080",
-"j.	c #200080",
-"k.	c #400080",
-"l.	c #600080",
-"m.	c #800080",
-"n.	c #A00080",
-"o.	c #C00080",
-"p.	c #E00080",
-"q.	c #002080",
-"r.	c #202080",
-"s.	c #402080",
-"t.	c #602080",
-"u.	c #802080",
-"v.	c #A02080",
-"w.	c #C02080",
-"x.	c #E02080",
-"y.	c #004080",
-"z.	c #204080",
-"A.	c #404080",
-"B.	c #604080",
-"C.	c #804080",
-"D.	c #A04080",
-"E.	c #C04080",
-"F.	c #E04080",
-"G.	c #006080",
-"H.	c #206080",
-"I.	c #406080",
-"J.	c #606080",
-"K.	c #806080",
-"L.	c #A06080",
-"M.	c #C06080",
-"N.	c #E06080",
-"O.	c #008080",
-"P.	c #208080",
-"Q.	c #408080",
-"R.	c #608080",
-"S.	c #808080",
-"T.	c #A08080",
-"U.	c #C08080",
-"V.	c #E08080",
-"W.	c #00A080",
-"X.	c #20A080",
-"Y.	c #40A080",
-"Z.	c #60A080",
-"`.	c #80A080",
-" +	c #A0A080",
-".+	c #C0A080",
-"++	c #E0A080",
-"@+	c #00C080",
-"#+	c #20C080",
-"$+	c #40C080",
-"%+	c #60C080",
-"&+	c #80C080",
-"*+	c #A0C080",
-"=+	c #C0C080",
-"-+	c #E0C080",
-";+	c #00E080",
-">+	c #20E080",
-",+	c #40E080",
-"'+	c #60E080",
-")+	c #80E080",
-"!+	c #A0E080",
-"~+	c #C0E080",
-"{+	c #E0E080",
-"]+	c #0000C0",
-"^+	c #2000C0",
-"/+	c #4000C0",
-"(+	c #6000C0",
-"_+	c #8000C0",
-":+	c #A000C0",
-"<+	c #C000C0",
-"[+	c #E000C0",
-"}+	c #0020C0",
-"|+	c #2020C0",
-"1+	c #4020C0",
-"2+	c #6020C0",
-"3+	c #8020C0",
-"4+	c #A020C0",
-"5+	c #C020C0",
-"6+	c #E020C0",
-"7+	c #0040C0",
-"8+	c #2040C0",
-"9+	c #4040C0",
-"0+	c #6040C0",
-"a+	c #8040C0",
-"b+	c #A040C0",
-"c+	c #C040C0",
-"d+	c #E040C0",
-"e+	c #0060C0",
-"f+	c #2060C0",
-"g+	c #4060C0",
-"h+	c #6060C0",
-"i+	c #8060C0",
-"j+	c #A060C0",
-"k+	c #C060C0",
-"l+	c #E060C0",
-"m+	c #0080C0",
-"n+	c #2080C0",
-"o+	c #4080C0",
-"p+	c #6080C0",
-"q+	c #8080C0",
-"r+	c #A080C0",
-"s+	c #C080C0",
-"t+	c #E080C0",
-"u+	c #00A0C0",
-"v+	c #20A0C0",
-"w+	c #40A0C0",
-"x+	c #60A0C0",
-"y+	c #80A0C0",
-"z+	c #A0A0C0",
-"A+	c #C0A0C0",
-"B+	c #E0A0C0",
-"C+	c #00C0C0",
-"D+	c #20C0C0",
-"E+	c #40C0C0",
-"F+	c #60C0C0",
-"G+	c #80C0C0",
-"H+	c #A0C0C0",
-"  J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.....-.S.^ * =                   ",
-"S.y+H+y+y+y+y+y+y+y+y+y+y+y+y+y+y+y+R.R.J.J.S.* =               ",
-"S.R.x+o+Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.o+p+x+x+x+R.R.^ *             ",
-"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.o+o+R.S.*           ",
-"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.Q.`.*         ",
-"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H.^ *       ",
-"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H+      ",
-"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.G.I.=     ",
-"S.R.Q.H.G.G.G.G.G.y.` ` ` ` ` ` y.y.G.G.G.G.G.G.G.G.H.H.G.y+    ",
-"S.R.Q.H.G.G.G.G.G.`  .=.=.=.=...S S ` y.G.G.G.G.G.G.G.H.G.H.    ",
-"S.R.o+H.H.H.H.H.G.` ^             * R.` y.H.H.H.H.H.H.H.H.y.H+  ",
-"S.R.o+H.H.H.H.H.H.` ^                 = H.H.H.H.H.H.H.H.H.G.R.  ",
-"S.R.o+P.H.H.H.H.H.` ^                   * H.H.H.H.H.H.H.H.H.z.  ",
-"S.p+o+P.H.H.H.H.H.` ^                   * o+P.P.H.H.H.H.P.H.`   ",
-"S.p+o+n+P.P.P.P.H.z.^                   * R.o+n+P.P.P.P.P.H.`   ",
-"S.p+w+n+n+n+n+n+H.z.^                   * S.w+n+n+n+n+n+n+H. .* ",
-"S.x+w+n+n+n+n+n+P.z.^                   ^ R.x+o+n+n+n+n+n+H. .* ",
-"S.x+w+n+n+n+n+n+P.H.^                   ^ R.x+w+n+n+n+n+n+H. .  ",
-"S.x+w+n+n+n+n+n+n+H.^                 * S.R.x+w+n+n+n+n+n+H. .  ",
-"S.x+x+w+n+n+n+n+n+H.^               = S...G+F+w+n+n+n+n+n+H. .  ",
-"S.x+x+w+v+v+v+v+n+H.z+          = * S...S.G+x+w+v+v+v+v+n+H.R.  ",
-"S.x+x+w+w+w+w+w+n+H.z+  = * ^ ^ S.....`.- G+w+w+w+w+w+w+P. .^   ",
-"S.x+F+w+w+w+w+w+w+H.H+= -.....=.J.`.- - G+w+w+w+w+w+w+w+H.T     ",
-"S.x+F+w+w+w+w+w+w+H.H+* - - - - - - G+F+w+w+w+w+w+w+w+P. .R.    ",
-"S.x+F+w+w+w+w+w+w+H.H+* - G+F+F+F+F+E+w+w+w+w+w+w+w+w+H. .      ",
-"S.y+F+E+w+w+w+w+w+H.H+* F+F+w+w+w+w+w+w+w+w+w+w+w+w+H. .^       ",
-"S.G+F+E+E+E+E+E+w+P.H+* F+F+E+E+E+E+E+E+E+E+E+E+w+H. .S.        ",
-"S.G+F+F+E+E+E+E+w+P.H+* G+F+E+E+E+E+E+E+E+E+E+w+H.T S.          ",
-"S.G+F+F+E+E+E+E+w+Q.H+* G+F+E+E+E+E+E+E+E+w+Q.H.T `.            ",
-"S.G+G+F+F+F+F+F+E+Q.H+* - F+F+F+E+E+w+w+Q.H. ...*               ",
-"^ G+F+x+x+x+x+x+Q.I.H+  - F+x+x+Q.Q.I. . .=.z+                  ",
-"  H+I. . . . . . . .^   R... . . .J.S.^ =                       "};
+"] 	c #DFE7EF",
+"^ 	c #A6BED4",
+"/ 	c #5683AD",
+"( 	c #346A9D",
+"_ 	c #3A6E9F",
+": 	c #8CAAC7",
+"< 	c #CFDCE8",
+"[ 	c #4B7AA6",
+"} 	c #3A6E9E",
+"| 	c #396D9D",
+"1 	c #8BA9C6",
+"2 	c #FEFEFE",
+"3 	c #6C92B6",
+"4 	c #376B9C",
+"5 	c #386B9B",
+"6 	c #8AA8C5",
+"7 	c #648CB1",
+"8 	c #366A9A",
+"9 	c #89A8C4",
+"0 	c #FCFCFD",
+"a 	c #356898",
+"b 	c #89A7C3",
+"c 	c #F1F4F8",
+"d 	c #C2D1E0",
+"e 	c #C4D2E0",
+"f 	c #C8D6E3",
+"g 	c #E1E8EF",
+"h 	c #A4BBD1",
+"i 	c #336797",
+"j 	c #346797",
+"k 	c #88A6C2",
+"l 	c #D0DBE6",
+"m 	c #285F91",
+"n 	c #2F6494",
+"o 	c #2E6394",
+"p 	c #2B6192",
+"q 	c #366898",
+"r 	c #A1B9CE",
+"s 	c #2A6091",
+"t 	c #336595",
+"u 	c #88A5C1",
+"v 	c #D0DCE7",
+"w 	c #2C6092",
+"x 	c #2E6193",
+"y 	c #9CB4CB",
+"z 	c #557FA7",
+"A 	c #316493",
+"B 	c #86A4C0",
+"C 	c #D0DCE6",
+"D 	c #2B5F90",
+"E 	c #799AB9",
+"F 	c #306392",
+"G 	c #86A4BF",
+"H 	c #2A5E8E",
+"I 	c #265B8C",
+"J 	c #F2F5F8",
+"K 	c #89A5C0",
+"L 	c #2F6190",
+"M 	c #85A3BE",
+"N 	c #285C8D",
+"O 	c #23588A",
+"P 	c #F7F9FB",
+"Q 	c #86A3BF",
+"R 	c #2E608E",
+"S 	c #85A2BD",
+"T 	c #CFDBE5",
+"U 	c #275B8A",
+"V 	c #3A6995",
+"W 	c #7092B2",
+"X 	c #2C5E8D",
+"Y 	c #84A1BC",
+"Z 	c #CFDAE5",
+"` 	c #26598A",
+" .	c #245889",
+"..	c #B1C3D4",
+"+.	c #46729B",
+"@.	c #2B5D8B",
+"#.	c #83A0BB",
+"$.	c #CEDAE5",
+"%.	c #235787",
+"&.	c #265988",
+"*.	c #255988",
+"=.	c #215686",
+"-.	c #376692",
+";.	c #B3C5D6",
+">.	c #F3F5F8",
+",.	c #205585",
+"'.	c #2A5C8A",
+").	c #82A0BA",
+"!.	c #CEDAE4",
+"~.	c #467199",
+"{.	c #C8D5E0",
+"].	c #C9D6E1",
+"^.	c #E7EDF2",
+"/.	c #94ADC4",
+"(.	c #285B89",
+"_.	c #285A88",
+":.	c #819FB9",
+"<.	c #527A9F",
+"[.	c #F9FAFB",
+"}.	c #275987",
+"|.	c #275986",
+"1.	c #819DB8",
+"2.	c #CED9E3",
+"3.	c #51799E",
+"4.	c #567DA0",
+"5.	c #265785",
+"6.	c #809DB8",
+"7.	c #51789D",
+"8.	c #698AAA",
+"9.	c #245584",
+"0.	c #255683",
+"a.	c #809CB7",
+"b.	c #CDD8E3",
+"c.	c #4F779B",
+"d.	c #EDF1F5",
+"e.	c #4B7399",
+"f.	c #235582",
+"g.	c #235482",
+"h.	c #819DB7",
+"i.	c #D2DCE5",
+"j.	c #4F769B",
+"k.	c #D7E0E8",
+"l.	c #7896B2",
+"m.	c #1B4E7D",
+"n.	c #225380",
+"o.	c #36628B",
+"p.	c #53799C",
+"q.	c #52789C",
+"r.	c #477095",
+"s.	c #2F5D87",
+"t.	c #6A8BA9",
+"u.	c #6F8FAD",
+"v.	c #688AA8",
+"w.	c #4F769A",
+"x.	c #235380",
+"y.	c #1A4D7B",
+"z.	c #21527E",
+"A.	c #20507D",
+"B.	c #1E4F7B",
+"C.	c #1D4D7A",
+"D.	c #1B4C78",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ",
+"$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ ",
+"% % % % % % & * = = = = = = - ; > , ' ) % % % % % % % % % % % % ",
+"! ! ! ! ! ! ~ { { { { { { { { { { { ] ^ / ( ! ! ! ! ! ! ! ! ! ! ",
+"_ _ _ _ _ _ : { { { { { { { { { { { { { { < [ } _ _ _ _ _ _ _ _ ",
+"| | | | | | 1 { { { { { { { { { { { { { { 2 { 3 4 | | | | | | | ",
+"5 5 5 5 5 5 6 { { { { { { { { { { { { { { { 2 { 7 5 5 5 5 5 5 5 ",
+"8 8 8 8 8 8 9 { { { { { { { { { { { { { { { { 2 0 5 8 8 8 8 8 8 ",
+"a a a a a a b { { { { { c d e f g { { { { { { { { h i a a a a a ",
+"j j j j j j k { { { { { l m n o p q r { { { { { { 0 s j j j j j ",
+"t t t t t t u { { { { { v w t t t t x y { { { { { { z t t t t t ",
+"A A A A A A B { { { { { C D A A A A A A { { { { { { E A A A A A ",
+"F F F F F F G { { { { { l H F F F F F I J { { { { { K F F F F F ",
+"L L L L L L M { { { { { l N L L L L L O P { { { { { Q L L L L L ",
+"R R R R R R S { { { { { T U R R R R R V { { { { { { W R R R R R ",
+"X X X X X X Y { { { { { Z ` X X X X  ...{ { { { { { +.X X X X X ",
+"@.@.@.@.@.@.#.{ { { { { $.%.&.*.=.-.;.{ { { { { { >.,.@.@.@.@.@.",
+"'.'.'.'.'.'.).{ { { { { !.~.{.].^.{ { { { { { { { /.(.'.'.'.'.'.",
+"_._._._._._.:.{ { { { { !.<.{ { { { { { { { { 2 [.}._._._._._._.",
+"|.|.|.|.|.|.1.{ { { { { 2.3.{ { { { { { { { 2 { 4.|.|.|.|.|.|.|.",
+"5.5.5.5.5.5.6.{ { { { { 2.7.{ { { { { { { 2 { 8.9.5.5.5.5.5.5.5.",
+"0.0.0.0.0.0.a.{ { { { { b.c.{ { { { { 2 { d.e.f.0.0.0.0.0.0.0.0.",
+"g.g.g.g.g.g.h.{ { { { { i.j.{ { { { { k.l.m.g.g.g.g.g.g.g.g.g.g.",
+"n.n.n.n.n.n.o.p.q.q.q.q.r.s.t.u.v.w.x.y.n.n.n.n.n.n.n.n.n.n.n.n.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.",
+"B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.",
+"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
+"D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D."};
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -1,7 +1,7 @@
 <?php
 // File to force Dolibarr wizard installer choices.
 //
-// This file must be present into htdocs/install directory
+// This file must be present into htdocs/install or /etc/dolibarr directory
 // during install process to be used.
 //
 //
@@ -25,14 +25,18 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';

-// Value to overwrite path to use shared libraries/fonts instead of embedded one
-$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
+// Value to overwrite path to use shared libraries/fonts instead of embedded one.
+// If we enable/disable libraries declaration during install, we must also check they are 
+// not removed from package (see in rules file),
+// declared into dependencies (see in control file)
+$force_dolibarr_lib_TCPDF_PATH='';
+$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
 $force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 $force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
 $force_dolibarr_lib_PHPEXCEL_PATH='';
-$force_dolibarr_lib_TCPDF_PATH='';
 $force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 $force_dolibarr_js_JQUERY='/javascript/jquery';
 $force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
--- a/build/debian/patches/install.dpatch
+++ b/build/debian/patches/install.dpatch
@@ -11,7 +11,7 @@

 --- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
 +++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -64,8 +64,8 @@
+@@ -63,8 +63,8 @@
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -24,7 +24,7 @@
 // Include configuration
 --- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
 +++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -84,8 +84,8 @@
+@@ -71,8 +71,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -37,7 +37,7 @@
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
 --- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
 +++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -79,8 +79,8 @@
+@@ -69,8 +69,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -46,5 +46,5 @@
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
- $charset="UTF-8";	// If not output format found in any conf file
+ 
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -27,13 +27,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr "Seveur web à reconfigurer automatiquement:"

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"

 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/po/templates.pot
+++ b/build/debian/po/templates.pot
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Project-Id-Version: dolibarr\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,13 +19,13 @@ msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr ""

 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -32,13 +33,13 @@ msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr ""

 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -93,23 +93,28 @@ clean:
 	# clean from all embedded libraries (we use package dependencies instead)
 	rm -fr htdocs/includes/adodbtime
 	rm -fr htdocs/includes/ckeditor
-	rm -fr htdocs/includes/fpdfi
+#	rm -fr htdocs/includes/fpdfi
 	rm -fr htdocs/includes/fonts
 	rm -fr htdocs/includes/geoip
 	rm -fr htdocs/includes/nusoap
 	rm -fr htdocs/includes/odtphp/zip/pclzip
+	rm -fr htdocs/includes/phpmailer
 	rm -fr htdocs/includes/jquery/css
 	rm -fr htdocs/includes/jquery/js
 	rm -fr htdocs/includes/jquery/plugins/flot
 	rm -fr htdocs/includes/jquery/plugins/jstree
 	rm -fr htdocs/includes/jquery/plugins/lightbox
 	rm -fr htdocs/includes/jquery/plugins/mobile
+	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils

+	# clean from files to avoid warning of missing dependencies
+	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
+
 	# Licence files are included into copyright file.
 	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER = 3.3.0
+PROJECT_NUMBER = 3.3.2

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
--- a/build/doxygen/jenkins_doxygen.doxyfile
+++ b/build/doxygen/jenkins_doxygen.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER = 3.2.0
+PROJECT_NUMBER = 3.3.0

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@@ -0,0 +1,7 @@
+# DOLIWAMP, THE DOLIBARR INSTALLER FOR WINDOWS
+
+DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
+It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also and all prerequisites like the web server, and the database in one autoinstall process.
+
+If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
+
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
--- a/build/exe/doliwamp/doliwampsmall.bmp
+++ b/build/exe/doliwamp/doliwampsmall.bmp
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -39,7 +39,7 @@ MaxRequestsPerChild  0
 # at a local disk.  If you wish to share the same ServerRoot for multiple
 # httpd daemons, you will need to change at least LockFile and PidFile.
 #
-ServerRoot "WAMPROOT/bin/apache/apache2.2.6"
+ServerRoot "WAMPROOT/bin/apache/apacheWAMPAPACHEVERSION"

 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -326,6 +326,7 @@ else

 // Read PHP extensions
 $loaded_extensions = get_loaded_extensions();
+$phpExtContents='';
 foreach ($loaded_extensions as $extension)
 	$phpExtContents .= "<li>${extension}</li>";

@@ -334,6 +335,7 @@ foreach ($loaded_extensions as $extension)
 // Read alias directory
 $listoffile=array();
 $aliasarray=array();
+$aliasContents='';
 if (is_dir($aliasDir))
 {
    $handle=opendir($aliasDir);
@@ -530,7 +532,6 @@ a:hover {
 </td>
 <td align="right">
 	<ul class="utility">
-		<li>${wampserverVersion}</li>
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -375,7 +375,7 @@ display_errors = On
 ; Even when display_errors is on, errors that occur during PHP's startup
 ; sequence are not displayed.  It's strongly recommended to keep
 ; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
+display_startup_errors = On

 ; Log errors into a log file (server-specific log, stderr, or error_log (below))
 ; As stated above, you're strongly advised to use error logging in place of
@@ -534,7 +534,7 @@ doc_root =
 user_dir =

 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "WAMPROOT/bin/php/php5.2.5/ext/"
+extension_dir = "WAMPROOT/bin/php/phpWAMPPHPVERSION/ext/"

 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -657,7 +657,7 @@ extension=php_bz2.dll
 extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
-extension=php_exif.dll
+;extension=php_exif.dll
 ;extension=php_fdf.dll
 extension=php_gd2.dll
 ;extension=php_gettext.dll
@@ -677,7 +677,7 @@ extension=php_mysql.dll
 extension=php_mysqli.dll
 ;extension=php_oci8.dll
 extension=php_openssl.dll
-extension=php_pdo.dll
+;extension=php_pdo.dll              ; for php 5.2.11
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 extension=php_pdo_mysql.dll
@@ -685,19 +685,19 @@ extension=php_pdo_mysql.dll
 ;extension=php_pdo_oci8.dll
 ;extension=php_pdo_odbc.dll
 ;extension=php_pdo_pgsql.dll
-;extension=php_pdo_sqlite.dll
-extension=php_pgsql.dll
+extension=php_pdo_sqlite.dll
+;extension=php_pgsql.dll
 ;extension=php_pspell.dll
-extension=php_shmop.dll
+;extension=php_shmop.dll
 ;extension=php_snmp.dll
 extension=php_soap.dll
 extension=php_sockets.dll
-extension=php_sqlite.dll
+;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-extension=php_zip.dll
+;extension=php_zip.dll
 ;extension=php_xdebug-2.0.5-5.2.dll


@@ -710,7 +710,8 @@ extension=php_zip.dll
 ; date.timezone = UTC          => You have local = greenwich.
 ; date.timzeone = Europe/Paris => To use TZ+1
 ; See http://php.net/date.timezone
-;date.timezone =
+date.timezone = UTC
+;date.timezone = USERTIMEZONE

 ;date.default_latitude = 31.7667
 ;date.default_longitude = 35.2333
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -12,7 +12,10 @@ a package onto LaunchPad
 # To install all packagers tools:
 # sudo apt-get install bzr-builder bzr dpatch pbuilder debootstrap devscripts

+
 # Init local working env
+#----------------------------------
+
 - Create account on launchpad.org
 - Create Project
 - Link project to official SCM server
@@ -21,65 +24,125 @@ a package onto LaunchPad
 - Run from command line: 
    bzr launchpad-login yourlogin
    bzr whoami "Your Name <email@email.com>"
- Create a file /.pbuilderrc with content
+    bzr whoami
+- Edit file ~/.bashrc to add
+DEBFULLNAME="<Your name>" 
+DEBEMAIL="<Your email address>" 
+- Create a Bazaar directory
+    mkdir bzr
+
+If you want to build/test package locally:
+- Create a file ~/.pbuilderrc with content
    COMPONENTS="main universe multiverse restricted"
 - Create chroot ubuntu env
    sudo pbuilder create [--distribution sid|squeeze]
- Edit file ~/.bashrc ti add
-DEBFULLNAME="<Your name>" 
-DEBEMAIL="<Your email address>" 

-# Init package tools for launchpad
- Create a Bazaar directory
-    mkdir bzr
- Create debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
+
+# Push/declare Dolibarr sources to Launchpad
+#----------------------------------
+- From Launchpad project (https://launchpad.net/dolibarr), register a series: 
+    Call it 'trunk' or 'beta' or 'stable'
+    Use branch (dev):
+    ~eldy/dolibarr/develop
+    ~eldy/dolibarr/beta
+    ~eldy/dolibarr/stable
+    or 
+    Use URL pattern (beta or stable):
+    http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    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]
+    bzr init
+    bzr add
+    bzr commit -m "Init"
+    bzr push lp:~yourlogin/dolibarr/[beta|stable]
+
+- List of series are visible here: https://launchpad.net/dolibarr/+series
+
+# To update Dolibarr into launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+    cd dolibarr-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    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]
    cd bzr
    mkdir debian
    cd debian
-    bzr init
    cp -pr dolibarr_root/debian bzr/debian
-    bzr add debian
-    bzr commit -m "Init"
-    bzr push lp:~eldy/dolibarr/debian
-  or download it from launchpad bazaar:
+    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 download it from launchpad bazaar:
    cd bzr
-    bzr branch lp:~eldy/dolibarr/debian
- To update this debian directory, edit files into the bzr dir and run
+    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+
+# Get debian dir repository from launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|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 status
+	-- Update files here --
    bzr commit -m "Description of change"
-    bzr push lp:~eldy/dolibarr/debian
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
+
+
+# Define a recipe into launchpad (a rule to build packages into a PPA)
+#----------------------------------
 - Create a file dolibarr.recipe with content
    cd bzr
    vi dolibarr.recipe
-        # bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
-        lp:dolibarr
-        merge packaging lp:~eldy/dolibarr/debian
+    	For dev:
+	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+		lp:dolibarr
+		merge packaging lp:~yourlogin/+junk/debian-dev
+    	For stable:
+	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+		lp:dolibarr/stable
+		merge packaging lp:~yourlogin/+junk/debian-stable
 - 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 ~eldy/dolibarr/debian
+  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 <working-dir>/<project>_<version>.dsc

    
-# To get/download package:
-Add signing key of the Launchpad repository:
+# To get/download package from PPA:
+#----------------------------------
+
+- Add signing key of the Launchpad repository:
 > gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
 > sudo apt-key add ~/.gnupg/pubring.gpg

-Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
+- Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
 For the development snapshot version: 
-deb http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
-deb-src http://ppa.launchpad.net/eldy/dolibarr-dev/ubuntu precise main 
+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 stable version:
-deb http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 
-deb-src http://ppa.launchpad.net/eldy/dolibarr-stable/ubuntu precise main 
+deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
+deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 

-Update your package cache:
+- Update your package cache:
 > apt-get update

-Install Dolibarr: 
+- Install Dolibarr: 
 > apt-get install dolibarr

-
-    
-    
+   
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="3";
-$BUILD="0-alpha";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="3";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD

@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -24,7 +24,7 @@ $RPMSUBVERSION="auto";	# auto use value found into BUILD
 "RPM_OPENSUSE"=>"rpmbuild",
 "DEB"=>"dpkg",
 "APS"=>"zip",
-"EXEDOLIWAMP"=>"iscc.exe"
+"EXEDOLIWAMP"=>"ISCC.exe"
 );
 %ALTERNATEPATH=(
 "7z"=>"7-ZIP",
@@ -38,13 +38,14 @@ $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
 $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
-$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
-if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat
-if (-d "/usr/src/RPM")    { $RPMDIR="/usr/src/RPM"; } # mandrake
+$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD";
+if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
+if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
+if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake


 use vars qw/ $REVISION $VERSION /;
-$VERSION="3.2";
+$VERSION="3.3";



@@ -102,7 +103,8 @@ for (0..@ARGV-1) {
    	$FILENAMESNAPSHOT.="-".$PREFIX; 
    }
 }
-if ($ENV{"DESTI"}) { $DESTI = $ENV{"DESTI"}; }		# Force output dir if env DESTI is defined
+if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)    { $DESTI = $ENV{"DESTIBETARC"}; }		# Force output dir if env DESTI is defined
+if ($ENV{"DESTISTABLE"}  && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTI is defined


 print "Makepack version $VERSION\n";
@@ -165,7 +167,7 @@ $atleastonerpm=0;
 foreach my $target (keys %CHOOSEDTARGET) {
 	if ($target =~ /RPM/i)
 	{
-		if ($atleastonerpm && ! $ENV{"DESTI"})
+		if ($atleastonerpm && ($DESTI eq "$SOURCE/build"))
 		{
 			print "Error: You asked creation of several rpms. Because all rpm have same name, you must defined an environment variable DESTI to tell packager where it can create subdirs for each generated package.\n";
 			exit;
@@ -314,16 +316,21 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;

-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/lightbox`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jstree`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
+   	    
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
@@ -332,6 +339,7 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
    
    # Build package for each target
@@ -412,7 +420,7 @@ if ($nboftargetok) {
            print "Go to directory $BUILDROOT\n";
     		$olddir=getcwd();
     		chdir("$BUILDROOT");
-    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\\*";
+    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
 			print $cmd."\n";
 			$ret= `$cmd`;
            chdir("$olddir");
@@ -450,6 +458,9 @@ if ($nboftargetok) {

            $FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";

+            #print "Create directory $RPMDIR\n";
+            #$ret=`mkdir -p "$RPMDIR"`;
+
    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n";
    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm");
    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
@@ -503,7 +514,7 @@ if ($nboftargetok) {
    		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
    		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
    		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
-    	
+
    		# Move to final dir
   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
   		    #$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
@@ -645,6 +656,8 @@ if ($nboftargetok) {
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
            
          
            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
@@ -763,8 +776,10 @@ if ($nboftargetok) {
     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
 
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
+ 			$SOURCEBACK=$SOURCE;
+ 			$SOURCEBACK =~ s/\//\\/g;
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
@@ -772,6 +787,8 @@ if ($nboftargetok) {
    		# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
    		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
+            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
    		next;
    	}
    }
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -77,15 +77,16 @@ for (0..@ARGV-1) {
 }
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($ENV{"DESTI"}) { $DESTI = $ENV{"DESTI"}; }		# Force output dir if env DESTI is defined
+if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
+$NEWDESTI=$DESTI;


 print "Makepack for modules version $VERSION\n";
 print "Source directory: $SOURCE\n";
-print "Target directory: $DESTI\n";
+print "Target directory: $NEWDESTI\n";


-# Ask and set version $MAJOR and $MINOR
+# Ask and set version $MAJOR, $MINOR and $BUILD
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
 chomp($PROJVERSION);
@@ -139,8 +140,8 @@ foreach my $PROJECT (@PROJECTLIST) {
 	}
 	
 	$FILENAME="$PROJECT";
-	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR";
-	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
 	if (-d "/usr/src/redhat") {
 	    # redhat
 	    $RPMDIR="/usr/src/redhat";
@@ -253,7 +254,7 @@ foreach my $PROJECT (@PROJECTLIST) {
 		
 				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
 				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
-				print VF "Version: ".$MAJOR.".".$MINOR."\n";
+				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
 				print VF "Build  : ".$fulldate."\n";
 				close VF;
 		    }
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -8,16 +8,14 @@ This files describe steps made by Dolibarr packaging team to make a
 beta version of Dolibarr, step by step.

 - Check all files are commited.
- Update version/info in / directory (README*.txt, ChangeLog...)
- Update version number with x.x.x   in build/doxygen/dolibarr-doxygen.doxyfile
- Update version number with x.x.x   in build/perl/virtualmin/dolibarr.pl
+- Update version/info in /ChangeLog
+- Update version number with x.x.x-y in htdocs/filefunc.inc.php
 - Update version number with x.x.x-y in build/makepack-dolibarr.pl
 - Update version number with x.x.x-y in build/debian/changelog
 - Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
- Update version number with x.x.x-y in htdocs/filefunc.inc.php
- Update version number with x.x.x-y in htdocs/install/inc.php
- Update version number with x.x.x-y in htdocs/support/inc.php
- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
+- Update version number with x.x.x-y in build/rpm/*.spec
+- Update version number with x.x.x   in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.x.x   in build/perl/virtualmin/dolibarr.pl
 - Commit all changes.
 - Add a Tag (DOLIBARR_x_y_BETA)
 - Create a branch (DOLIBARR_x_y_BRANCH).
@@ -34,13 +32,12 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.

 - Check all files are commited.
- Update version/info in / directory (README*.txt, ChangeLog...)
- Update version number with x.x.x-y in build/makepack-dolibarr.pl
- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
- Update version number with x.x.x-y in htdocs/filefunc.inc.php
- Update version number with x.x.x-y in htdocs/install/inc.php
- Update version number with x.x.x-y in htdocs/support/inc.php
- Update version number with x.x.x-y in htdocs/build/rpm/*.spec
+- Update version/info in ChangeLog
+- Update version number with x.x.x in htdocs/filefunc.inc.php
+- Update version number with x.x.x in build/makepack-dolibarr.pl
+- Update version number with x.x.x in build/debian/changelog
+- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x in build/rpm/*.spec
 - Update PAD files.
 - Commit all changes.
 - Add a Tag (DOLIBARR_x_y)
--- a/build/obs/README
+++ b/build/obs/README
@@ -0,0 +1,35 @@
+README (English)
+##################################################
+OBS Package tools
+##################################################
+
+This directory contains files to explain how to publish
+a package onto OBS
+
+
+# Create a project onto OBS
+#----------------------------------
+https://build.opensuse.org
+
+
+Add attributes:
+OBS:Screenshots         URL of screenshot
+OBS:QualityCategory     Development|Testing|Stable|Private
+OBS:Maintained          1
+
+
+To submit a snapshot for building, we should have a service file with content
+<services>
+  <service name="download_src_package">
+    <param name="host">www.dolibarr.org</param>
+    <param name="protocol">http</param>
+    <param name="path">/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm</param>
+  </service>
+</services>
+
+How to have such a service ?
+Try to make "Add file" and select Remote URL and enter http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm
+
+Then add into advanded - attributes
+OBS:Screenshots http://www.dolibarr.org/images/phocagallery/dolibarr_screenshot1.png
+OBS:QualityCategory Testing
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.1.0</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>09</Program_Release_Day>
-		<Program_Release_Year>2011</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.1..0</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>09</Program_Release_Day>
-		<Program_Release_Year>2011</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.1.0</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>09</Program_Release_Day>
-		<Program_Release_Year>2011</Program_Release_Year>
+		<Program_Version>3.3.2</Program_Version>
+		<Program_Release_Month>05</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -70,7 +70,7 @@
 			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to follow.</Char_Desc_250>
+			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
 			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
 			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:

@@ -83,8 +83,8 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt
 Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
 		</English>
 		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
+			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
+			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
 			<Char_Desc_450>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.1.0</Program_Version>
-		<Program_Release_Month>07</Program_Release_Month>
-		<Program_Release_Day>09</Program_Release_Day>
-		<Program_Release_Year>2011</Program_Release_Year>
+		<Program_Version>3.3.2</Program_Version>
+		<Program_Release_Month>05</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -94,8 +94,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		</Italian>
 	</Program_Descriptions>
 	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/pages/dolibarrwinbin.php</Application_Info_URL>
+		<Application_URLs>
+			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
 			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
 			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2012 Regis Houssin  <regis@dolibarr.fr>
+# \author       (c)2009-2012 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------


@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.3.0", "3.2.0", "3.1.0", "3.0.1", "2.9.0" );
+return ( "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }

 sub script_dolibarr_category
@@ -43,13 +43,6 @@ sub script_dolibarr_php_vers
 return ( 5 );
 }

-sub script_dolibarr_php_vars
-{
-return ( [ 'memory_limit', '64M', '+' ],
-	[ 'upload_max_filesize', '10M', '+' ],
-	[ 'max_execution_time', '60', '+' ] );
-}
-
 sub script_dolibarr_php_modules
 {
 local ($d, $ver, $phpver, $opts) = @_;
@@ -348,21 +341,34 @@ if ($opts->{'newdb'}) {
 return (1, "Dolibarr directory and tables deleted.");
 }

-# script_dolibarr_latest(version)
-# Returns a URL and regular expression or callback func to get the version
-sub script_dolibarr_latest
+# script_dolibarr_realversion(&domain, &opts)
+# Returns the real version number of some script install, or undef if unknown
+sub script_dolibarr_realversion
+{
+local ($d, $opts, $sinfo) = @_;
+local $lref = &read_file_lines("$opts->{'dir'}/filefunc.inc.php", 1);
+foreach my $l (@$lref) {
+		if ($l =~ /'DOL_VERSION','([0-9a-z\.\-]+)'/) {
+                return $1;
+                }
+        }
+return undef;
+}
+
+# script_dolibarr_check_latest(version)
+# Checks if some version is the latest for this project, and if not returns
+# a newer one. Otherwise returns undef.
+sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
-if ($ver >= 3.0) {
-	return ( "http://sourceforge.net/projects/dolibarr/files/".
-		  "Dolibarr%20ERP-CRM",
-		  "(3\\.[0-9\\.]+)" );
-	}
-elsif ($ver >= 2.9) {
-	return ( "http://www.dolibarr.fr/files/stable/",
-		 "dolibarr\\-(2\\.[0-9\\.]+)" );
-	}
-return ( );
+local @vers = &osdn_package_versions("dolibarr",
+                $ver >= 3.2 ? "dolibarr\\-(3\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.1 ? "dolibarr\\-(3\\.1\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3 ? "dolibarr\\-(3\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
+                              "dolibarr\\-(2\\.8\\.[0-9\\.]+)\\.tgz");
+return "Failed to find versions" if (!@vers);
+return $ver eq $vers[0] ? undef : $vers[0];
 }

 sub script_dolibarr_site
@@ -376,4 +382,3 @@ return 2;
 }

 1;
-
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -11,7 +11,8 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
 # This is standard command to work on RPM packaging:
 #
 # To install all packagers tools:
-# yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
+# Fedora: yum -y install rpmlint fedora-packager mock koji hunspell-en hunspell-es hunspell-fr hunspell-it
+# OpenSuse: yast --install update-desktop-files
 #
 # rpmlint file.rpm				    Test a package
 # mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -1,7 +1,7 @@
 diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 --- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
 +++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -64,8 +64,8 @@ 
+@@ -63,8 +63,8 @@ 
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -84,8 +84,8 @@
+@@ -71,8 +71,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -29,7 +29,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 --- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
 +++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -79,8 +79,8 @@
+@@ -69,8 +69,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
@@ -38,5 +38,5 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
- $charset="UTF-8";	// If not output format found in any conf file
+ 
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -21,7 +21,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;
+Categories=Office;Finance;
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPLv2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -108,17 +108,20 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts

 # Lang
+echo "%defattr(0644, root, root, 0755)" > %{name}.lang
+echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
+  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
 	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
 	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >%{name}.lang
+done >>%{name}.lang


 #---- clean
@@ -131,6 +134,9 @@ done >%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
+
+%dir %_datadir/dolibarr
+
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -140,6 +146,8 @@ done >%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

+%dir %_datadir/dolibarr/build
+
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -170,11 +178,14 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
+%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/mailmanspip
+%_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/product
@@ -190,7 +201,9 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%defattr(0664, -, -)
+%dir %{_sysconfdir}/dolibarr
+
+%defattr(0664, root, apache)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -201,6 +214,8 @@ done >%{name}.lang
 #---- post (after unzip during install)
 %post

+echo Run post script of packager dolibarr_fedora.spec
+
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
@@ -217,7 +232,27 @@ echo Create document directory $docdir
 # Set correct owner on config files
 %{__chown} -R root:$apachegroup /etc/dolibarr/*

-# Create config for se $seconfig
+# If a conf already exists and its content was already completed by installer
+export config=%{_sysconfdir}/dolibarr/conf.php
+if [ -s $config ] && grep -q "File generated by" $config
+then 
+	# File already exist. We add params not found.
+	echo Add new params to overwrite path to use shared libraries/fonts
+	grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+	grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+fi
+
+# Create config for SE Linux
 echo Add SE Linux permissions for dolibarr
 # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
 semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
@@ -227,8 +262,13 @@ restorecon -R -v /var/lib/dolibarr

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -262,35 +302,38 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun

-# Define vars
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
+if [ "x$1" = "x0" ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
+	# Remove
+	echo "Removed package"

-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
+	# Define vars
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    /sbin/service httpd restart
+	fi
+else
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi


-
 %changelog
-* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -8,26 +8,63 @@

 Name: dolibarr
 Version: __VERSION__
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+Release: __RELEASE__%{?dist}
+%else
 Release: __RELEASE__
+%endif
 Summary: ERP and CRM software for small and medium companies or foundations 
 Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPLv2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

 URL: http://www.dolibarr.org
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+%else
+%if 0%{?mdkversion}
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+%else
+%if 0%{?suse_version}
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+%else
 Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
+%endif
+%endif
+%endif
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build

+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+Group: Applications/Productivity
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
+Requires: mysql-server, mysql
+BuildRequires: desktop-file-utils
+%else
+%if 0%{?mdkversion}
+Group: Applications/Productivity
+Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
+Requires: mysql, mysql-client 
+%else
+%if 0%{?suse_version}
+# Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
+Group: Productivity/Office/Management
+Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
+Requires: mysql-community-server, mysql-community-server-client 
+BuildRequires: update-desktop-files fdupes
+%else
 Group: Applications/Productivity
 Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap 
 Requires: mysql-server, mysql 
 Requires: php-mysql >= 4.1.0 
+%endif
+%endif
+%endif

 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -48,7 +85,7 @@ de Recursos Empresariales (ERP) y Gestión de la Relación con los
 Clientes (CRM) así como para para otras diferentes actividades. 
 Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
 que necesita y haciendo hincapié en su facilidad de uso.
-    
+
 %description -l fr
 Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
 artisans ou associations. Il permet de gérer vos clients, prospect, 
@@ -80,19 +117,42 @@ cui hai bisogno ed essere facile da usare.

 #---- install
 %install
-%{__rm} -rf $RPM_BUILD_ROOT

+%if 0%{?sles_version}
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir} $RPM_BUILD_ROOT
+%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
+%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%else
+%{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%endif
+
 %{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
 %{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apache.conf
 %{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/file_contexts.dolibarr
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
+%else
+%if 0%{?mdkversion}
+%{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
+%else
+%if 0%{?suse_version}
+%{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
+%else
 %{__install} -m 644 build/rpm/install.forced.php.generic $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
+%endif
+%endif
+%endif

 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
+#Commented as it fails with error: /usr/bin/install: cannot stat build/rpm/dolibarr.desktop: No such file or directory
+#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop --vendor=""
+%endif

 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/rpm
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
@@ -102,19 +162,42 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
+%else
+%if 0%{?mdkversion}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
+%else
+%if 0%{?suse_version}
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
+%endif
+%endif
+%endif

 # Lang
+echo "%defattr(0644, root, root, 0755)" > %{name}.lang
+echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
+  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
 	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
 	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >%{name}.lang
+done >>%{name}.lang
+
+%if 0%{?suse_version} || 0%{?sles_version}
+# Enable this command to tag desktop file for suse
+%suse_update_desktop_file dolibarr Office Finance
+# Enable this command to allow suse detection of duplicate files and create hardlinks instead
+%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
+%endif


 #---- clean
@@ -127,6 +210,9 @@ done >%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
+
+%dir %_datadir/dolibarr
+
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -136,6 +222,8 @@ done >%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

+%dir %_datadir/dolibarr/build
+
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -166,11 +254,14 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
+%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/mailmanspip
+%_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/product
@@ -186,7 +277,17 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%defattr(0664, -, -)
+%dir %{_sysconfdir}/dolibarr
+
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+%defattr(0664, root, apache)
+%else
+%if 0%{?suse_version}
+%defattr(0664, root, www)
+%else
+%defattr(0664, root, -)
+%endif
+%endif
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -197,8 +298,20 @@ done >%{name}.lang
 #---- post (after unzip during install)
 %post

+echo Run post script of packager dolibarr_generic.spec
+
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+export apacheuser='apache';
+export apachegroup='apache';
+%else
+%if 0%{?suse_version}
+export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+export apacheuser='wwwrun';
+export apachegroup='www';
+%else
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"

 # Detect OS
@@ -228,6 +341,8 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -g
    export apachegroup='www-data';
 fi
 echo OS detected: $os
+%endif
+%endif

 # Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
@@ -236,6 +351,9 @@ echo OS detected: $os
 echo Create document directory $docdir
 %{__mkdir} -p $docdir

+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+
+%else
 # Create install.forced.php into Dolibarr install directory
 if [ "x$os" = "xubuntu-debian" ]
 then
@@ -250,24 +368,71 @@ then
 	%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
 	%{__chmod} -R 660 $installconfig
 fi
+%endif

 # Set correct owner on config files
 %{__chown} -R root:$apachegroup /etc/dolibarr/*

-# Create config for se $seconfig
+# If a conf already exists and its content was already completed by installer
+export config=%{_sysconfdir}/dolibarr/conf.php
+if [ -s $config ] && grep -q "File generated by" $config
+then 
+	# File already exist. We add params not found.
+	echo Add new params to overwrite path to use shared libraries/fonts
+	grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+	grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+%else
+%if 0%{?mdkversion}
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+%else
+%if 0%{?suse_version}
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
+%else
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+%endif
+%endif
+%endif
+fi
+
+# Create config for SE Linux
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
+%else
 if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
+%endif
+%if 0%{?mdkversion} || 0%{?suse_version}
+%else
    echo Add SE Linux permissions for dolibarr
    # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
    semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
    semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
    restorecon -R -v /etc/dolibarr
    restorecon -R -v /var/lib/dolibarr
+%endif
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
+%else
 fi
+%endif

 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -283,11 +448,22 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then
    %{_sysconfdir}/init.d/apache2 restart
 fi

-# Restart mysql
-echo Restart mysql
+# Restart mysql server
+echo Restart mysql server
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	/sbin/service mysqld restart
+%else
+%if 0%{?suse_version}
+	/sbin/service mysql restart
+%else
 if [ -f /etc/init.d/mysqld ]; then
    /etc/init.d/mysqld restart
 fi
+if [ -f /etc/init.d/mysql ]; then
+    /etc/init.d/mysql restart
+fi
+%endif
+%endif

 # Show result
 echo
@@ -302,51 +478,71 @@ echo



-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun

-# Detect OS
-os='unknown';
-if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-    export os='opensuse';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-fi
-if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-fi
-if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-fi
-
-# Remove apache link
-if [ -L $apachelink ] ;
+if [ "x$1" = "x0" ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
+	# Remove
+	echo "Removed package"

-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
+	# Define vars
+	os='unknown';
+	%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	%else
+	%if 0%{?suse_version}
+	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	%else
+	if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+	    export os='fedora-redhat';
+	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+	    export os='opensuse';
+	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+	    export os='mageia-mandriva';
+	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+	    export os='ubuntu-debian';
+	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	fi
+	%endif
+	%endif
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+		%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	    /sbin/service httpd restart
+		%else
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	    %endif
+	fi
+else
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi


-
 %changelog
-* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPLv2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -105,17 +105,20 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts

 # Lang
+echo "%defattr(0644, root, root, 0755)" > %{name}.lang
+echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
+  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
 	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
 	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >%{name}.lang
+done >>%{name}.lang


 #---- clean
@@ -128,6 +131,9 @@ done >%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
+
+%dir %_datadir/dolibarr
+
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -137,6 +143,8 @@ done >%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

+%dir %_datadir/dolibarr/build
+
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -167,11 +175,14 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
+%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/mailmanspip
+%_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/product
@@ -187,7 +198,9 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%defattr(0664, -, -)
+%dir %{_sysconfdir}/dolibarr
+
+%defattr(0664, root, apache)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -198,6 +211,8 @@ done >%{name}.lang
 #---- post (after unzip during install)
 %post

+echo Run post script of packager dolibarr_mandriva.spec
+
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
@@ -214,10 +229,35 @@ echo Create document directory $docdir
 # Set correct owner on config files
 %{__chown} -R root:$apachegroup /etc/dolibarr/*

+# If a conf already exists and its content was already completed by installer
+export config=%{_sysconfdir}/dolibarr/conf.php
+if [ -s $config ] && grep -q "File generated by" $config
+then 
+	# File already exist. We add params not found.
+	echo Add new params to overwrite path to use shared libraries/fonts
+	grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+	grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+fi
+
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -238,6 +278,9 @@ echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
    /etc/init.d/mysqld restart
 fi
+if [ -f /etc/init.d/mysql ]; then
+    /etc/init.d/mysql restart
+fi

 # Show result
 echo
@@ -251,35 +294,44 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun

-# Define vars
-export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
+if [ "x$1" = "x0" ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-fi
+	# Remove
+	echo "Removed package"

-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
+	# Define vars
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	fi
+else
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi



 %changelog
-* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3
 - Initial version (#723326)
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -14,7 +14,7 @@ Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, auto-entrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti

-License: GPLv2+
+License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

@@ -25,9 +25,11 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build

 Group: Productivity/Office/Management
-Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, fonts-ttf-dejavu
+Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
 Requires: mysql-community-server, mysql-community-server-client 
-#BuildRequires: update-desktop-files fdupes
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files fdupes
+%endif

 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -104,23 +106,30 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts

 # Lang
+echo "%defattr(0644, root, root, 0755)" > %{name}.lang
+echo "%dir %{_datadir}/%{name}/htdocs/langs" >> %{name}.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*
 do
  lang=$(basename $i)
  lang1=`expr substr $lang 1 2`; 
  lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
+  echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
  if [ "$lang1" = "$lang2" ] ; then
 	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  else
 	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
  fi
-done >%{name}.lang
+done >>%{name}.lang
+
+%if 0%{?suse_version}

 # Enable this command to tag desktop file for suse
-#%suse_update_desktop_file dolibarr
+%suse_update_desktop_file dolibarr

 # Enable this command to allow suse detection of duplicate files and create hardlinks instead
-#%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
+%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs
+
+%endif


 #---- clean
@@ -133,6 +142,9 @@ done >%{name}.lang
 %files -f %{name}.lang

 %defattr(0755, root, root, 0755)
+
+%dir %_datadir/dolibarr
+
 %dir %_datadir/dolibarr/scripts
 %_datadir/dolibarr/scripts/*

@@ -142,6 +154,8 @@ done >%{name}.lang
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop

+%dir %_datadir/dolibarr/build
+
 %dir %_datadir/dolibarr/build/rpm
 %_datadir/dolibarr/build/rpm/*

@@ -172,11 +186,14 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/fichinter
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
+%_datadir/dolibarr/htdocs/holiday
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
+%_datadir/dolibarr/htdocs/mailmanspip
+%_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
 %_datadir/dolibarr/htdocs/product
@@ -192,7 +209,9 @@ done >%{name}.lang
 %_datadir/dolibarr/htdocs/*.php
 %_datadir/dolibarr/htdocs/*.txt

-%defattr(0664, -, -)
+%dir %{_sysconfdir}/dolibarr
+
+%defattr(0664, root, www)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
 %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
 %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php
@@ -203,6 +222,8 @@ done >%{name}.lang
 #---- post (after unzip during install)
 %post

+echo Run post script of packager dolibarr_opensuse.spec
+
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
 export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
@@ -219,10 +240,35 @@ echo Create document directory $docdir
 # Set correct owner on config files
 %{__chown} -R root:$apachegroup /etc/dolibarr/*

+# If a conf already exists and its content was already completed by installer
+export config=%{_sysconfdir}/dolibarr/conf.php
+if [ -s $config ] && grep -q "File generated by" $config
+then 
+	# File already exist. We add params not found.
+	echo Add new params to overwrite path to use shared libraries/fonts
+	grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+	grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
+	grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
+fi
+
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-    echo Create dolibarr web server config link $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi

 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -240,9 +286,7 @@ fi

 # Restart mysql
 echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
+/sbin/service mysql restart

 # Show result
 echo
@@ -256,35 +300,43 @@ echo "-------------------------------------------------------"
 echo


-#---- postun (after uninstall)
+#---- postun (after upgrade or uninstall)
 %postun

-# Define vars
-export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-
-# Remove apache link
-if [ -L $apachelink ] ;
+if [ "x$1" = "x0" ] ;
 then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
+	# Remove
+	echo "Removed package"
+	
+	# Define vars
+	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	fi
+else
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi

-# Restart web servers if required
-if [ "x$status" = "xpurge" ] ;
-then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
-fi
-
-

 %changelog
-* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
+* Mon Apr 22 2013 Laurent Destailleur 3.3.3-0.3
 - Initial version (#723326)
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -30,6 +30,6 @@ $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
 //$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
-$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype';
+$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf';

 ?>
--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -75,16 +75,21 @@
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
 		<severity>0</severity>
 	</rule>
-	<rule
-		ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
 		<severity>0</severity>
 	</rule>

    <!-- Tweaks to metrics -->
    <rule ref="Generic.Metrics.CyclomaticComplexity">
        <properties>
-            <property name="complexity" value="40" />
-            <property name="absoluteComplexity" value="100" />
+            <property name="complexity" value="80" />
+            <property name="absoluteComplexity" value="200" />
        </properties>
    </rule>
    <rule ref="Generic.Metrics.NestingLevel">
@@ -96,14 +101,15 @@

 	<rule ref="Generic.NamingConventions.ConstructorName" />
 	<!-- Check if we use PHP4 constructor instead of __construct() -->
-	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle">
-        <severity>0</severity>
-	</rule>
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle" />

 	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />

    <rule ref="Generic.PHP.DeprecatedFunctions" />
-
+    <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
+        <severity>0</severity>
+    </rule>
+	
 	<rule ref="Generic.PHP.DisallowShortOpenTag" />

    <rule ref="Generic.PHP.ForbiddenFunctions" />
@@ -116,6 +122,10 @@

 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />

+	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
+        <severity>0</severity>
+	</rule>
+    
    <rule ref="Generic.VersionControl.SubversionProperties" />

 	<!-- Disallow usage of tab -->
@@ -188,17 +198,25 @@

 	<rule ref="PEAR.Functions.FunctionCallSignature" />

+	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
+	    <severity>0</severity>
+	</rule>
+	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />

 	<rule ref="PEAR.NamingConventions.ValidClassName" />
 	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
        <severity>0</severity>
 	</rule>
+	
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
        <severity>0</severity>
 	</rule>

 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
+        <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
        <severity>0</severity>
 	</rule>
@@ -212,8 +230,8 @@
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />

 	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
-	
-	<!--
+
+	<!-- Need to be commented to be disabled
 	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
        <severity>0</severity>
    </rule>
@@ -221,8 +239,7 @@
    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
        <severity>0</severity>
    </rule>
-    
-    -->
+	-->
    
    <!-- Already found as a Generic rule -->
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -75,16 +75,21 @@
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
 		<severity>0</severity>
 	</rule>
-	<rule
-		ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
 		<severity>0</severity>
 	</rule>

    <!-- Tweaks to metrics -->
    <rule ref="Generic.Metrics.CyclomaticComplexity">
        <properties>
-            <property name="complexity" value="40" />
-            <property name="absoluteComplexity" value="100" />
+            <property name="complexity" value="80" />
+            <property name="absoluteComplexity" value="200" />
        </properties>
    </rule>
    <rule ref="Generic.Metrics.NestingLevel">
@@ -103,7 +108,10 @@
 	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />

    <rule ref="Generic.PHP.DeprecatedFunctions" />
-
+    <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
+        <severity>0</severity>
+    </rule>
+	
 	<rule ref="Generic.PHP.DisallowShortOpenTag" />

    <rule ref="Generic.PHP.ForbiddenFunctions" />
@@ -116,6 +124,10 @@

 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />

+	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
+        <severity>0</severity>
+	</rule>
+    
    <rule ref="Generic.VersionControl.SubversionProperties" />

 	<!-- Disallow usage of tab -->
@@ -188,17 +200,25 @@

 	<rule ref="PEAR.Functions.FunctionCallSignature" />

+	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
+	    <severity>0</severity>
+	</rule>
+	
 	<rule ref="PEAR.Functions.ValidDefaultValue" />

 	<rule ref="PEAR.NamingConventions.ValidClassName" />
 	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
        <severity>0</severity>
 	</rule>
+	
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
        <severity>0</severity>
 	</rule>

 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
+        <severity>0</severity>
+	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
        <severity>0</severity>
 	</rule>
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
@@ -3,7 +3,7 @@
 --
 -- 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
-- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,10 +17,10 @@
 -- ===================================================================

 CREATE TABLE llx_osc_categories (
-  rowid int(11) unsigned NOT NULL auto_increment,
-  dolicatid int(11) NOT NULL default '0',
-  osccatid int(11) NOT NULL default '0',
+  rowid integer unsigned NOT NULL auto_increment,
+  dolicatid integer NOT NULL default '0',
+  osccatid integer NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY dolicatid (dolicatid),
  UNIQUE KEY osccatid (osccatid)
-) TYPE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';
+) ENGINE=InnoDB;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
@@ -3,7 +3,7 @@
 --
 -- 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
-- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
@@ -3,7 +3,7 @@
 --
 -- 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
-- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 -- ===================================================================

 CREATE TABLE llx_osc_customer (
-  rowid int(11) NOT NULL default '0',
+  rowid integer NOT NULL default '0',
  datem datetime default NULL,
-  fk_soc int(11) NOT NULL default '0',
+  fk_soc integer NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_soc (fk_soc)
-) TYPE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';
+) ENGINE=InnoDB;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
@@ -3,7 +3,7 @@
 --
 -- 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
-- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 -- ===================================================================

 CREATE TABLE llx_osc_order (
-  rowid int(11) NOT NULL default '0',
+  rowid integer NOT NULL default '0',
  datem datetime default NULL,
-  fk_commande int(11) NOT NULL default '0',
+  fk_commande integer NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_commande (fk_commande)
-) TYPE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';
+) ENGINE=InnoDB;
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
@@ -3,7 +3,7 @@
 --
 -- 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
-- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,11 +17,11 @@
 -- ===================================================================

 CREATE TABLE llx_osc_product (
-  rowid int(11) NOT NULL default '0',
+  rowid integer NOT NULL default '0',
  datem datetime default NULL,
-  fk_product int(11) NOT NULL default '0',
+  fk_product integer NOT NULL default '0',
  PRIMARY KEY  (rowid),
  UNIQUE KEY fk_product (fk_product)
-) TYPE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';
+) ENGINE=InnoDB;


--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -30,7 +30,7 @@ public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=
 by
 public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=false, $maxh=0, $valign='T', $fitcell=false) {

-* Removed all fonts except dejavu* (greek, arab, persan, romanian, turkish), freemono* (russian), stsongstdlight* (chinese), helvetica* (all other) and useless directories (fonts/utils, docs, cache, images)
+* Removed all fonts except dejavu* (used by greek, arab, persan, romanian, turkish), freemono* (russian), stsongstdlight* (chinese), helvetica* (all other) and useless directories (fonts/utils, docs, cache, images)

 * Replace in tcpdf_config.php
 define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
--- a/dev/examples/README
+++ b/dev/examples/README
@@ -4,5 +4,5 @@ README (English)
 This directory contains samples of code to use Dolibarr business classes to build
 external interfaces that need to read/update data from/into Dolibarr.

-You can also have a look at the Dolibarr doxygen doc that describe all files and classes:
+You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
 http://www.dolibarr.org/html_doxygen/index.html
--- a/dev/examples/create_invoice.php
+++ b/dev/examples/create_invoice.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/manage_order.php
+ *      \file       dev/examples/create_invoice.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author name here
+ *		\author		Put author's name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/examples/create_order.php
+++ b/dev/examples/create_order.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/manage_order.php
+ *      \file       dev/examples/create_order.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author name here
+ *		\author		Put author's name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/examples/create_product.php
+++ b/dev/examples/create_product.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -19,7 +19,7 @@
 /**
 *      \file       dev/examples/create_product.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author name here
+ *		\author		Put author's name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

@@ -64,7 +64,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 // Create instance of object
 $myproduct=new Product($db);

-// Définition des propriétés de l'instance product
+// Definition of product instance properties
 $myproduct->ref                = '1234';
 $myproduct->libelle            = 'libelle';
 $myproduct->price              = '10';
--- a/dev/examples/create_user.php
+++ b/dev/examples/create_user.php
@@ -0,0 +1,110 @@
+#!/usr/bin/php
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       dev/examples/create_user.php
+ *      \brief      This file is an example for a command line script
+ *		\author		Put author's name here
+ *		\remarks	Put here some comments
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Global variables
+$version='1.7';
+$error=0;
+
+
+// -------------------- START OF YOUR CODE HERE --------------------
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
+
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
+@set_time_limit(0);
+
+// Load user and its permissions
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$user->getrights();
+
+
+print "***** ".$script_file." (".$version.") *****\n";
+
+// Start of transaction
+$db->begin();
+
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
+
+// Create invoice object
+$obj = new User($db);
+//$obj->initAsSpecimen();
+
+$obj->login = 'ABCDEF';
+$obj->nom   = 'ABCDEF';
+
+// Create invoice
+$idobject=$obj->create($user);
+if ($idobject > 0)
+{
+	// Change status to validated
+	$result=$obj->setStatut(1);
+	if ($result > 0) print "OK Object created with id ".$idobject."\n";
+	else
+	{
+		$error++;
+		dol_print_error($db,$obj->error);
+	}
+}
+else if ($obj->error == 'ErrorLoginAlreadyExists')
+{
+     print "User with login ".$obj->login." already exists\n";
+}
+else
+{
+	$error++;
+	dol_print_error($db,$obj->error);
+}
+
+
+// -------------------- END OF YOUR CODE --------------------
+
+if (! $error)
+{
+	$db->commit();
+	print '--- end ok'."\n";
+}
+else
+{
+	print '--- end error code='.$error."\n";
+	$db->rollback();
+}
+
+$db->close();
+
+return $error;
+?>
--- a/dev/examples/get_contracts.php
+++ b/dev/examples/get_contracts.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -17,9 +17,9 @@
 */

 /**
- *      \file       dev/examples/manage_order.php
+ *      \file       dev/examples/get_contracts.php
 *      \brief      This file is an example for a command line script
- *		\author		Put author name here
+ *		\author		Put author's name here
 *		\remarks	Put here some comments
 */

@@ -29,7 +29,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -5,7 +5,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';


 /*
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -5,7 +5,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';


 /*
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -5,7 +5,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -5,7 +5,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../../htdocs/master.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';

 $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
 $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
--- a/dev/initdata/initdemo.sh
+++ b/dev/initdata/initdemo.sh
@@ -1,17 +1,19 @@
-#!/bin/bash
+#!/bin/sh
 #------------------------------------------------------
 # Script to purge and init a database with demo values.
-# Note: "dialog" tool need to be available.
+# Note: "dialog" tool need to be available if no parameter provided.
 #
-# Regis Houssin       - regis@dolibarr.fr
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
 # WARNING: This script erase all data of database
 # with data into dump file
+#
+# Regis Houssin       - regis.houssin@capnetworks.com
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: initdemo.sh
+# usage: initdemo.sh mysqldump_dolibarr_x.x.x.sql database port login pass
 #------------------------------------------------------


-export dumpfile="mysqldump_dolibarr_3.1.0.sql"
 export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
 if [ "x$mydir" = "x" ]
 then
@@ -27,122 +29,140 @@ then
 	exit
 fi

-# ----------------------------- input file
-DIALOG=${DIALOG=dialog}
-DIALOG="$DIALOG --ascii-lines"
-fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Input dump file :" 16 55 $dumpfile 2> $fichtemp
-valret=$?
-case $valret in
-  0)
-dumpfile=`cat $fichtemp`;;
-  1)
-exit;;
-  255)
-exit;;
-esac

-# ----------------------------- database name
-DIALOG=${DIALOG=dialog}
-DIALOG="$DIALOG --ascii-lines"
-fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
-valret=$?
-case $valret in
-  0)
-base=`cat $fichtemp`;;
-  1)
-exit;;
-  255)
-exit;;
-esac
+# ----------------------------- command line params
+dumpfile=$1;
+base=$2;
+port=$3;
+admin=$4;
+passwd=$5;

-# ---------------------------- database port
-DIALOG=${DIALOG=dialog}
-fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp

-valret=$?
+# ----------------------------- if no params on command line
+if [ "x$passwd" = "x" ]
+then
+	export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
+	export dumpfile=`basename $dumpfile`

-case $valret in
-  0)
-port=`cat $fichtemp`;;
-  1)
-exit;;
-  255)
-exit;;
-esac
+	# ----------------------------- input file
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Input dump file :" 16 55 $dumpfile 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	dumpfile=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ----------------------------- database name
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	base=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- database port
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	port=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- compte admin mysql
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Mysql root login (ex: root):" 16 55 root 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	admin=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- mot de passe admin mysql
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	passwd=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- chemin d'acces du repertoire documents
+	#DIALOG=${DIALOG=dialog}
+	#fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	#trap "rm -f $fichtemp" 0 1 2 5 15
+	#$DIALOG --title "Init Dolibarr with demo values" --clear \
+	#        --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 55 2> $fichtemp
+	
+	#valret=$?
+	
+	#case $valret in
+	#  0)
+	#docs=`cat $fichtemp`;;
+	#  1)
+	#exit;;
+	#  255)
+	#exit;;
+	#esac
+	
+	# ---------------------------- confirmation
+	DIALOG=${DIALOG=dialog}
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
+	
+	case $? in
+	        0)      echo "Ok, start process...";;
+	        1)      exit;;
+	        255)    exit;;
+	esac

-# ---------------------------- compte admin mysql
-DIALOG=${DIALOG=dialog}
-fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Mysql root login (ex: root):" 16 55 root 2> $fichtemp
+fi

-valret=$?
-
-case $valret in
-  0)
-admin=`cat $fichtemp`;;
-  1)
-exit;;
-  255)
-exit;;
-esac
-
-# ---------------------------- mot de passe admin mysql
-DIALOG=${DIALOG=dialog}
-fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-trap "rm -f $fichtemp" 0 1 2 5 15
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
-
-valret=$?
-
-case $valret in
-  0)
-passwd=`cat $fichtemp`;;
-  1)
-exit;;
-  255)
-exit;;
-esac
-
-# ---------------------------- chemin d'acces du repertoire documents
-#DIALOG=${DIALOG=dialog}
-#fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-#trap "rm -f $fichtemp" 0 1 2 5 15
-#$DIALOG --title "Init Dolibarr with demo values" --clear \
-#        --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 55 2> $fichtemp
-
-#valret=$?
-
-#case $valret in
-#  0)
-#docs=`cat $fichtemp`;;
-#  1)
-#exit;;
-#  255)
-#exit;;
-#esac
-
-# ---------------------------- confirmation
-DIALOG=${DIALOG=dialog}
-$DIALOG --title "Init Dolibarr with demo values" --clear \
-        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
-
-case $? in
-        0)      echo "Ok, start process...";;
-        1)      exit;;
-        255)    exit;;
-esac

 # ---------------------------- run sql file
 if [ "x$passwd" != "x" ]
@@ -151,8 +171,14 @@ then
 fi
 #echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
-echo "mysql -P$port $base < $mydir/$dumpfile"
+echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
 mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+export res=$?

-echo "Dolibarr data demo has been loaded."
+if [ "x$res" = "x0" ]
+then
+	echo "Success, file successfully loaded."
+else
+	echo "Error, load failed."
+fi
 echo
--- a/dev/initdata/mysqldump_dolibarr_2.9.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_2.9.0.sql
--- a/dev/initdata/mysqldump_dolibarr_3.2.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.2.0.sql
--- a/dev/initdata/mysqldump_dolibarr_3.3.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.3.0.sql
--- a/dev/initdata/removedemo.sh
+++ b/dev/initdata/removedemo.sh
@@ -3,13 +3,29 @@
 # Script to remove setup of a Dolibarr installation.
 # Note: "dialog" tool need to be available.
 #
-# Regis Houssin - regis@dolibarr.fr
+# Regis Houssin       - regis.houssin@capnetworks.com
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
-# WARNING: This script erase all data of database
+# WARNING: This script erase setup of instance, 
+# but not the database
 #------------------------------------------------------

-export mydir=`echo "$_" | sed -e 's/removedemo.sh//'`;
+
+export mydir=`echo "$0" | sed -e 's/removedemo.sh//'`;
+if [ "x$mydir" = "x" ]
+then
+    export mydir="./"
+fi
+export id=`id -u`;
+
+
+# ----------------------------- check if root
+if [ "x$id" != "x0" -a "x$id" != "x1001" ]
+then
+    echo "Script must be ran as root"
+    exit
+fi
+

 DIALOG=${DIALOG=dialog}
 DIALOG="$DIALOG --ascii-lines"
@@ -34,5 +50,5 @@ rm $mydir../../htdocs/conf/conf.php 2>/dev/null
 echo "Remove file $mydir../../install.lock"
 rm $mydir../../install.lock 2>/dev/null

-echo "Dolibarr demo has been removed (need to be installed again)."
+echo "Dolibarr setup has been removed (need to be installed again. database not dropped)."
 echo
--- a/dev/initdata/savedemo.sh
+++ b/dev/initdata/savedemo.sh
@@ -0,0 +1,205 @@
+#!/bin/sh
+#------------------------------------------------------
+# Script to extrac a database with demo values.
+# Note: "dialog" tool need to be available if no parameter provided.
+#
+# Regis Houssin       - regis.houssin@capnetworks.com
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: savedemo.sh
+# usage: savedemo.sh mysqldump_dolibarr_x.x.x.sql database port login pass
+#------------------------------------------------------
+
+
+export mydir=`echo "$0" | sed -e 's/savedemo.sh//'`;
+if [ "x$mydir" = "x" ]
+then
+    export mydir="."
+fi
+export id=`id -u`;
+
+
+# ----------------------------- check if root
+if [ "x$id" != "x0" -a "x$id" != "x1001" ]
+then
+	echo "Script must be ran as root"
+	exit
+fi
+
+
+# ----------------------------- command line params
+dumpfile=$1;
+base=$2;
+port=$3;
+admin=$4;
+passwd=$5;
+
+
+# ----------------------------- if no params on command line
+if [ "x$passwd" = "x" ]
+then
+	export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
+	export dumpfile=`basename $dumpfile`
+
+	# ----------------------------- input file
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --inputbox "Output dump file :" 16 55 $dumpfile 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	dumpfile=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ----------------------------- database name
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	base=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- database port
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	port=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- compte admin mysql
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --inputbox "Mysql root login (ex: root):" 16 55 root 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	admin=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- mot de passe admin mysql
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	passwd=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	
+	# ---------------------------- chemin d'acces du repertoire documents
+	#DIALOG=${DIALOG=dialog}
+	#fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	#trap "rm -f $fichtemp" 0 1 2 5 15
+	#$DIALOG --title "Save Dolibarr with demo values" --clear \
+	#        --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 55 2> $fichtemp
+	
+	#valret=$?
+	
+	#case $valret in
+	#  0)
+	#docs=`cat $fichtemp`;;
+	#  1)
+	#exit;;
+	#  255)
+	#exit;;
+	#esac
+	
+	# ---------------------------- confirmation
+	DIALOG=${DIALOG=dialog}
+	$DIALOG --title "Save Dolibarr with demo values" --clear \
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
+	
+	case $? in
+	        0)      echo "Ok, start process...";;
+	        1)      exit;;
+	        255)    exit;;
+	esac
+
+fi
+
+
+# ---------------------------- run sql file
+if [ "x$passwd" != "x" ]
+then
+	export passwd="-p$passwd"
+fi
+export list="
+    --ignore-table=$base.llx_abonne
+    --ignore-table=$base.llx_abonne_extrafields 
+    --ignore-table=$base.llx_abonne_type
+    --ignore-table=$base.llx_abonnement 
+	--ignore-table=$base.llx_bt_namemap
+	--ignore-table=$base.llx_bt_speedlimit
+	--ignore-table=$base.llx_bt_summary
+	--ignore-table=$base.llx_bt_timestamps
+	--ignore-table=$base.llx_bt_webseedfiles
+	--ignore-table=$base.llx_dolicloud_customers
+	--ignore-table=$base.llx_c_dolicloud_plans
+	--ignore-table=$base.llx_cabinetmed_c_banques
+	--ignore-table=$base.llx_cabinetmed_c_ccam
+	--ignore-table=$base.llx_cabinetmed_c_examconclusion
+	--ignore-table=$base.llx_cabinetmed_cons
+	--ignore-table=$base.llx_cabinetmed_diaglec
+	--ignore-table=$base.llx_cabinetmed_examaut
+	--ignore-table=$base.llx_cabinetmed_exambio
+	--ignore-table=$base.llx_cabinetmed_examenprescrit
+	--ignore-table=$base.llx_cabinetmed_motifcons
+	--ignore-table=$base.llx_cabinetmed_patient
+	--ignore-table=$base.llx_publi_c_contact_list 
+	--ignore-table=$base.llx_publi_c_dnd_list
+	--ignore-table=$base.llx_publi_c_method_list 
+	" 
+echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
+mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile
+export res=$?
+
+if [ "x$res" = "x0" ]
+then
+	echo "Success, file successfully loaded."
+else
+	echo "Error, load failed."
+fi
+echo
--- a/dev/iso-normes/address_format.txt
+++ b/dev/iso-normes/address_format.txt
@@ -0,0 +1 @@
+http://bitboost.com/ref/international-address-formats.html#Formats
--- a/dev/iso-normes/world_tax_rates.txt
+++ b/dev/iso-normes/world_tax_rates.txt
@@ -0,0 +1 @@
+http://www.taxrates.cc/index.html
--- a/dev/licence/Links
+++ b/dev/licence/Links
@@ -2,4 +2,7 @@
 http://www.gnu.org/licenses/quick-guide-gplv3.fr.html

 * FAQ on GPL licence
-http://www.fsf.org/licensing/licenses/gpl-faq.html
+http://www.fsf.org/licensing/licenses/gpl-faq.html
+
+* Questions/Answers on Fork for using Dolibarr as a SaaS
+http://stackoverflow.com/questions/539291/rebranding-a-gpld-app-as-saas
--- a/dev/skeletons/README
+++ b/dev/skeletons/README
@@ -9,7 +9,7 @@ skeleton_*.php to build its generated code.


 modMyModule.class.php:
-Is a sample of module descriptor you can use if you want to build a new module/plugin for
+Is a sample of module descriptor that you can use if you want to build a new module/plugin for
 Dolibarr.


@@ -20,11 +20,7 @@ skeleton_page.php:
 Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.

 skeleton_class.class.php:
-Is a sample you can use as an example if you need to build a class file to access a new table
-required by a Dolibarr development.
-However it is better to run the script build_class_from_table.php that accept a table name as a 
-parameter and will used table description in database and the skeleton_class.class.php file to
-generate full code for your class file.
-After running this script, the class to access your table (insert a record, update, delete and select)
-is directly finished and can be used by your business code. No more coding for accesser on table
-is needed with this script as the file is completely generated once.
+Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
+However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
+After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
+No more coding is needed to get access to table with this script because the file is completely generated once.
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -58,7 +58,7 @@ if (! isset($argv[1]))

 if ($db->type != 'mysql' && $db->type != 'mysqli')
 {
-	print "Error: This script works with mysql driver only\n";
+	print "Error: This script works with mysql or mysqli driver only\n";
 	exit;
 }

@@ -67,15 +67,10 @@ print 'Tablename='.$argv[1]."\n";
 print "Current dir is ".getcwd()."\n";


-
-//--------------------------------
-// Build skeleton_class.class.php
-//--------------------------------
-
-$table=$argv[1];
+// Define array with list of properties
 $property=array();
+$table=$argv[1];
 $foundprimary=0;
-
 $resql=$db->DDLDescTable($table);
 if ($resql)
 {
@@ -121,9 +116,32 @@ if ($resql)
 else
 {
 	print "Error: Failed to get description for table '".$table."'.\n";
+	return false;
 }
 //var_dump($property);

+// Define substitute select parameters
+$varpropselect="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+    $i++;
+    if ($prop['field'] != 'rowid')
+    {
+        $varpropselect.="\t\t\$sql.= \" ";
+        $varpropselect.="t.".$prop['field'];
+        if ($i < count($property)) $varpropselect.=",";
+        $varpropselect.="\";";
+        $varpropselect.="\n";
+    }
+}
+
+
+
+//--------------------------------
+// Build skeleton_class.class.php
+//--------------------------------

 // Define working variables
 $table=strtolower($table);
@@ -296,22 +314,7 @@ $targetcontent=preg_replace('/\$sql.= " field1=".\(isset\(\$this->field1\)\?"\'"
 $targetcontent=preg_replace('/\$sql.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);

 // Substitute select parameters
-$varprop="\n";
-$cleanparam='';
-$i=0;
-foreach($property as $key => $prop)
-{
-	$i++;
-	if ($prop['field'] != 'rowid')
-	{
-		$varprop.="\t\t\$sql.= \" ";
-		$varprop.="t.".$prop['field'];
-		if ($i < count($property)) $varprop.=",";
-		$varprop.="\";";
-		$varprop.="\n";
-	}
-}
-$targetcontent=preg_replace('/\$sql\.= " t\.field1,";/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$sql\.= " t\.field1,";/', $varpropselect, $targetcontent);
 $targetcontent=preg_replace('/\$sql\.= " t\.field2";/', '', $targetcontent);

 // Substitute select set parameters
@@ -405,6 +408,54 @@ if ($fp)
 }
 else $error++;

+
+
+//--------------------------------
+// Build skeleton_page.php
+//--------------------------------
+
+// Read skeleton_page.php file
+$skeletonfile=$path.'skeleton_page.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+    print "\n";
+    print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+    print "Try to run script from skeletons directory.\n";
+    exit;
+}
+
+// Define output variables
+$outfile='out.'.$classmin.'_page.php';
+$targetcontent=$sourcecontent;
+
+// Substitute class name
+$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
+$targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
+$targetcontent=preg_replace('/\$element=\'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
+$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
+$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classname, $targetcontent);
+
+// Substitute comments
+$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
+$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
+$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
+
+// Substitute table name
+$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+    fputs($fp, $targetcontent);
+    fclose($fp);
+    print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+
 // -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------

 print "You can now rename generated files by removing the 'out.' prefix in their name and store them in a directory of your choice.\n";
--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_class.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@ $path=dirname(__FILE__).'/';

 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
    exit;
 }

@@ -142,6 +142,27 @@ while($i<count($properties))
 $targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
 $targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);

+// Substitute get method parameters
+$varprop="\n\t\t";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+
+	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
+
+	$i++;
+	if ($i == count($properties))
+		$varprop.="\n";
+	else
+		$varprop.="\n\t\t";
+}
+$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
+
+
+
 // Build file
 $fp=fopen($outfile,"w");
 if ($fp)
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@
 *  \ingroup    mymodule
 *  \brief      Description and activation file for module MyModule
 */
-include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';


 /**
@@ -38,7 +38,7 @@ class modMyModule extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMyModule($db)
+	function __construct($db)
 	{
        global $langs,$conf;

@@ -73,15 +73,19 @@ class modMyModule extends DolibarrModules
 		// for specific path of parts (eg: /mymodule/core/modules/barcode)
 		// for specific css file (eg: /mymodule/css/mymodule.css.php)
 		//$this->module_parts = array(
-		//                        	'triggers' => 0,                                 // Set this to 1 if module has its own trigger directory
-		//							'login' => 0,                                    // Set this to 1 if module has its own login method directory
-		//							'substitutions' => 0,                            // Set this to 1 if module has its own substitution function file
-		//							'menus' => 0,                                    // Set this to 1 if module has its own menus handler directory
-		//							'barcode' => 0,                                  // Set this to 1 if module has its own barcode directory
-		//							'models' => 0,                                   // Set this to 1 if module has its own models directory
-		//							'css' => '/mymodule/css/mymodule.css.php',       // Set this to relative path of css if module has its own css file
-		//							'hooks' => array('hookcontext1','hookcontext2')  // Set here all hooks context managed by module
-		//							'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) // Set here all workflow context managed by module
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (core/theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2')  	// Set here all hooks context managed by module
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
 		//                        );
 		$this->module_parts = array();

@@ -97,7 +101,7 @@ class modMyModule extends DolibarrModules
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("langfiles@mymodule");
+		$this->langfiles = array("mylangfile@mymodule");

 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
@@ -107,9 +111,9 @@ class modMyModule extends DolibarrModules
 		$this->const = array();

 		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  // To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:Title2:langfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  // To add another new tab identified by code tabname2
-        //                              'objecttype:-tabname');                                                     // To remove an existing tab identified by code tabname
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
+        //                              'objecttype:-tabname':NU:conditiontoremove);                                                     						// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'thirdparty'       to add a tab in third party view
 		// 'intervention'     to add a tab in intervention view
@@ -134,7 +138,7 @@ class modMyModule extends DolibarrModules
        /* Example:
        if (! isset($conf->mymodule->enabled)) $conf->mymodule->enabled=0;	// This is to avoid warnings
        $this->dictionnaries=array(
-            'langs'=>'mymodule@mymodule',
+            'langs'=>'mylangfile@mymodule',
            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
@@ -174,7 +178,7 @@ class modMyModule extends DolibarrModules


 		// Main menu entries
-		$this->menus = array();			// List of menus to add
+		$this->menu = array();			// List of menus to add
 		$r=0;

 		// Add here entries to declare new menus
@@ -186,20 +190,7 @@ class modMyModule extends DolibarrModules
 		//							'mainmenu'=>'mymodule',
 		//							'leftmenu'=>'mymodule',
 		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile',	                // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		                // Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'mymodule',
-		//							'leftmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagelevel1.php',
-		//							'langs'=>'mylangfile',	                // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'$conf->mymodule->enabled',	// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
 		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
@@ -208,13 +199,13 @@ class modMyModule extends DolibarrModules
 		// $r++;
 		//
 		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=mainmenucode',	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
+		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 		//							'type'=>'left',			                // This is a Left menu entry
 		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'mainmenucode',
+		//							'mainmenu'=>'xxx',
 		//							'leftmenu'=>'mymodule',
 		//							'url'=>'/mymodule/pagelevel2.php',
-		//							'langs'=>'mylangfile',	                // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'langs'=>'mylangfile@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
@@ -237,6 +228,7 @@ class modMyModule extends DolibarrModules
 		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
 		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
 		// $r++;
 	}

--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -61,7 +61,7 @@ class Skeleton_Class // extends CommonObject
    /**
     *  Create object into database
     *
-     *  @param	User	$user        User that create
+     *  @param	User	$user        User that creates
     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
     *  @return int      		   	 <0 if KO, Id of created object if OK
     */
@@ -102,10 +102,10 @@ class Skeleton_Class // extends CommonObject
 			if (! $notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
+	            // want this action calls a trigger.

 	            //// Call triggers
-	            //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 	            //$interface=new Interfaces($this->db);
 	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
 	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
@@ -133,7 +133,7 @@ class Skeleton_Class // extends CommonObject


    /**
-     *  Load object in memory from database
+     *  Load object in memory from the database
     *
     *  @param	int		$id    Id object
     *  @return int          	<0 if KO, >0 if OK
@@ -178,7 +178,7 @@ class Skeleton_Class // extends CommonObject
    /**
     *  Update object into database
     *
-     *  @param	User	$user        User that modify
+     *  @param	User	$user        User that modifies
     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
     *  @return int     		   	 <0 if KO, >0 if OK
     */
@@ -193,7 +193,7 @@ class Skeleton_Class // extends CommonObject
 		//...

 		// Check parameters
-		// Put here code to add control on parameters values
+		// Put here code to add a control on parameters values

        // Update request
        $sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET";
@@ -213,10 +213,10 @@ class Skeleton_Class // extends CommonObject
 			if (! $notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
+	            // want this action calls a trigger.

 	            //// Call triggers
-	            //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 	            //$interface=new Interfaces($this->db);
 	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
 	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
@@ -246,7 +246,7 @@ class Skeleton_Class // extends CommonObject
 	/**
 	 *  Delete object in database
 	 *
-     *	@param  User	$user        User that delete
+     *	@param  User	$user        User that deletes
     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
@@ -262,10 +262,10 @@ class Skeleton_Class // extends CommonObject
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
+		        // want this action calls a trigger.

 		        //// Call triggers
-		        //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 		        //$interface=new Interfaces($this->db);
 		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
 		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -36,15 +36,15 @@

 // Change this following line to use the correct relative path (../, ../../, etc)
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
-if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
-if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include("../../../dolibarr/htdocs/main.inc.php");     // Used on dev env only
-if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include("../../../../dolibarr/htdocs/main.inc.php");   // Used on dev env only
-if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include("../../../../../dolibarr/htdocs/main.inc.php");   // Used on dev env only
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
+if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php';
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
-// Change this following line to use the correct relative path from htdocs (do not remove DOL_DOCUMENT_ROOT)
-require_once(DOL_DOCUMENT_ROOT."/skeleton/skeleton_class.class.php");
+// Change this following line to use the correct relative path from htdocs
+dol_include_once('/module/class/skeleton_class.class.php');

 // Load traductions files requiredby by page
 $langs->load("companies");
@@ -118,11 +118,57 @@ jQuery(document).ready(function() {
 </script>';


-
-// Example 2 : Adding jquery code
+// Example 2 : Adding links to objects
 $somethingshown=$myobject->showLinkedObjectBlock();


+// Example 3 : List of data
+if ($action == 'list')
+{
+    $sql = "SELECT";
+    $sql.= " t.field1,";
+    $sql.= " t.field2";
+    $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as t";
+    $sql.= " WHERE field3 = 'xxx'";
+    $sql.= " ORDER BY field1 ASC";
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans('field1'),$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('field2'),$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+    print '</tr>';
+
+    dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        if ($num)
+        {
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                if ($obj)
+                {
+                    // You can use here results
+                    print '<tr><td>';
+                    print $obj->field1;
+                    print $obj->field2;
+                    print '</td></tr>';
+                }
+                $i++;
+            }
+        }
+    }
+    else
+    {
+        $error++;
+        dol_print_error($db);
+    }
+}
+
+
+
 // End of page
 llxFooter();
 $db->close();
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -5,7 +5,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -112,7 +112,7 @@ else print "Object with id ".$myobject->id." deleted\n";
 // An example of a direct SQL read without using the fetch method
 /*
 $sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
 $sql.= " WHERE field3 = 'xxx'";
 $sql.= " ORDER BY field1 ASC";

--- a/dev/skeletons/skeleton_webservice_server.php
+++ b/dev/skeletons/skeleton_webservice_server.php
@@ -3,7 +3,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -118,11 +118,25 @@ $server->register(
    'WS to get skeleton'
 );

+// Register WSDL
+$server->register(
+	'createSkeleton',
+	// Entry values
+	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string'),
+	$ns,
+	$ns.'#createSkeleton',
+	$styledoc,
+	$styleuse,
+	'WS to create a skeleton'
+);
+



 /**
- * Get produt or service
+ * Get Skeleton
 *
 * @param	array		$authentication		Array of authentication information
 * @param	int			$id					Id of object
@@ -192,6 +206,67 @@ function getSkeleton($authentication,$id,$ref='',$ref_ext='')
 }


+/**
+ * Create Skeleton
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	Skeleton	$skeleton		    $skeleton
+ * @return	array							Array result
+ */
+function createSkeleton($authentication,$skeleton)
+{
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: createSkeleton login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+
+
+	if (! $error)
+	{
+		$newobject=new Skeleton($db);
+		$newobject->prop1=$skeleton->prop1;
+		$newobject->prop2=$skeleton->prop2;
+		//...
+
+		$db->begin();
+
+		$result=$newobject->create($fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
+}

 // Return the results.
 $server->service($HTTP_RAW_POST_DATA);
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -3,7 +3,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
@@ -151,7 +151,7 @@ class autoTranslator
 	{
 		$this->_time_end = date('Y-m-d H:i:s');

-		if (count($this->_translatedFiles[$file])>0)
+		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0)
 		{
 			$fp = fopen($destPath, 'a');
 			fwrite($fp, "\r\n");
@@ -250,7 +250,7 @@ class autoTranslator
 	private function getLineValue($line)
 	{
 		$arraykey = explode('=',$line,2);
-		return trim($arraykey[1]);
+		return trim(isset($arraykey[1])?$arraykey[1]:'');
 	}

 	/**
@@ -275,17 +275,17 @@ class autoTranslator
 	 * Return translation of a value
 	 *
 	 * @param 	array	$src_texts		Array with one value
-	 * @param 	string	$src_lang		Language code source
-	 * @param 	string	$dest_lang		Language code target
+	 * @param 	string	$src_lang		Language code source (us, fr, it, ...)
+	 * @param 	string	$dest_lang		Language code target (es, de, ...)
 	 * @return 	string					Value translated
 	 */
 	private function translateTexts($src_texts, $src_lang, $dest_lang)
 	{
+		// We want to be sure that src_lang and dest_lang are using 2 chars only
 		$tmp=explode('_',$src_lang);
-		if ($tmp[0] == $tmp[1]) $src_lang=$tmp[0];
-
+		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0];
 		$tmp=explode('_',$dest_lang);
-		if ($tmp[0] == $tmp[1]) $dest_lang=$tmp[0];
+		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0];

 		//setting language pair
 		$lang_pair = $src_lang.'|'.$dest_lang;
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -4,7 +4,7 @@
 *
 * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
--- a/doc/images/appicon_128.png
+++ b/doc/images/appicon_128.png
--- a/doc/images/appicon_14.png
+++ b/doc/images/appicon_14.png
--- a/doc/images/appicon_16.ico
+++ b/doc/images/appicon_16.ico
--- a/doc/images/appicon_16.png
+++ b/doc/images/appicon_16.png
--- a/doc/images/appicon_32.png
+++ b/doc/images/appicon_32.png
--- a/doc/images/appicon_48.ico
+++ b/doc/images/appicon_48.ico
--- a/doc/images/appicon_64.png
+++ b/doc/images/appicon_64.png
--- a/doc/images/dolibarr.gif
+++ b/doc/images/dolibarr.gif
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`http://bitboost.com/ref/international-address-formats.html#Formats`