[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7dec32: FIX #5568
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7dec32: FIX #5568 |
|
Date: |
Sat, 27 Aug 2016 17:40:41 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7dec327995d98ba151b9c0153713bcdcd9aea3a3
https://github.com/Dolibarr/dolibarr/commit/7dec327995d98ba151b9c0153713bcdcd9aea3a3
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-01 (Mon, 01 Aug 2016)
Changed paths:
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
FIX #5568
Commit: 0d536bff5433b04b6bde7ce9c59f27b0daa59e90
https://github.com/Dolibarr/dolibarr/commit/0d536bff5433b04b6bde7ce9c59f27b0daa59e90
Author: florian HENRY <address@hidden>
Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths:
M htdocs/index.php
Log Message:
-----------
Fix dashboard
Commit: 965011c8bc0ffaebbb729db9382a53e57c95363a
https://github.com/Dolibarr/dolibarr/commit/965011c8bc0ffaebbb729db9382a53e57c95363a
Author: Juanjo Menent <address@hidden>
Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths:
M htdocs/index.php
Log Message:
-----------
Merge pull request #5579 from atm-florian/3.8
FIX : Weather icon is not calculated correctly
Commit: 94487cf411e094780f299ba4302a2edf34544215
https://github.com/Dolibarr/dolibarr/commit/94487cf411e094780f299ba4302a2edf34544215
Author: florian HENRY <address@hidden>
Date: 2016-08-08 (Mon, 08 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX #5594
Commit: 15f187c466f4ab64576fb11cc1c16e57580043dd
https://github.com/Dolibarr/dolibarr/commit/15f187c466f4ab64576fb11cc1c16e57580043dd
Author: florian HENRY <address@hidden>
Date: 2016-08-08 (Mon, 08 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
better test
Commit: 90cb71f34185c60f76fac15767d06dcab12fc542
https://github.com/Dolibarr/dolibarr/commit/90cb71f34185c60f76fac15767d06dcab12fc542
Author: florian HENRY <address@hidden>
Date: 2016-08-08 (Mon, 08 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
revert better fix
Commit: 95a66e7e63cc8a62e7f461beca312b313a69a369
https://github.com/Dolibarr/dolibarr/commit/95a66e7e63cc8a62e7f461beca312b313a69a369
Author: florian HENRY <address@hidden>
Date: 2016-08-08 (Mon, 08 Aug 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/index.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Work on accoutancy PgSQL comptatiblity and other stuff
Commit: beadb19fea2844c9e5e55c0c227237514d5c7688
https://github.com/Dolibarr/dolibarr/commit/beadb19fea2844c9e5e55c0c227237514d5c7688
Author: florian HENRY <address@hidden>
Date: 2016-08-08 (Mon, 08 Aug 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/index.php
Log Message:
-----------
fix list
Commit: dd905debb47ad6f4da1d36922021aba8d3896ac8
https://github.com/Dolibarr/dolibarr/commit/dd905debb47ad6f4da1d36922021aba8d3896ac8
Author: aspangaro <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/fourn/card.php
M htdocs/societe/soc.php
Log Message:
-----------
Uniformize presentation
Commit: 4a1fbffba3de7dc87a84025b5a1c02fd68068c2c
https://github.com/Dolibarr/dolibarr/commit/4a1fbffba3de7dc87a84025b5a1c02fd68068c2c
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #5595 from atm-florian/FIX_5594
FIX #5594
Commit: 82b14e30d70267a70a18067bf908d3c47e4564d2
https://github.com/Dolibarr/dolibarr/commit/82b14e30d70267a70a18067bf908d3c47e4564d2
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/index.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #5596 from atm-florian/40_accountancy
40 accountancy
Commit: 321814fae3e53af149627e6d381e9e94ffab81bf
https://github.com/Dolibarr/dolibarr/commit/321814fae3e53af149627e6d381e9e94ffab81bf
Author: florian HENRY <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
better fix for #5594
Commit: 8718edc5fd3159028e016999d987792cd2f0d8ca
https://github.com/Dolibarr/dolibarr/commit/8718edc5fd3159028e016999d987792cd2f0d8ca
Author: florian HENRY <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into FIX_5594
Commit: a2f1291f945ab14ec219d002f1edee37ee819c9d
https://github.com/Dolibarr/dolibarr/commit/a2f1291f945ab14ec219d002f1edee37ee819c9d
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/projet/element.php
Log Message:
-----------
Fix missing supplier proposals in project overview
Commit: 8c63d680838a4cee94e05b8abfe80bee205baf96
https://github.com/Dolibarr/dolibarr/commit/8c63d680838a4cee94e05b8abfe80bee205baf96
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/index.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: a1d139691922ecdbaf00cbc8e4c7b2ccabb08b5c
https://github.com/Dolibarr/dolibarr/commit/a1d139691922ecdbaf00cbc8e4c7b2ccabb08b5c
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/fourn/card.php
M htdocs/margin/tabs/productMargins.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/facture.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
Log Message:
-----------
Uniformize presentation
Commit: 9a0fed93d154b90af270d83ede67f92754787ce2
https://github.com/Dolibarr/dolibarr/commit/9a0fed93d154b90af270d83ede67f92754787ce2
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/index.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/product/reassortlot.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/productlot_card.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p37
Commit: 43ffb061ef2d040a44964d82dd9622ff006f3b92
https://github.com/Dolibarr/dolibarr/commit/43ffb061ef2d040a44964d82dd9622ff006f3b92
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/index.php
M htdocs/compta/bank/account.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
Commit: 5bb3b5c07450a2322110e8bfd6f445452dcf9eca
https://github.com/Dolibarr/dolibarr/commit/5bb3b5c07450a2322110e8bfd6f445452dcf9eca
Author: florian HENRY <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
Commit: d38ff5c246410dea9841941e6bb55b25cd475848
https://github.com/Dolibarr/dolibarr/commit/d38ff5c246410dea9841941e6bb55b25cd475848
Author: florian HENRY <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/projet/element.php
Log Message:
-----------
FIX : create proposal from project
Commit: cd8585da6397335487d62048aa43fbd0b638e6df
https://github.com/Dolibarr/dolibarr/commit/cd8585da6397335487d62048aa43fbd0b638e6df
Author: florian HENRY <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/fichinter/card.php
M htdocs/projet/element.php
Log Message:
-----------
fix for finche inter same problem
Commit: c391ca5b329e2b45ab9f8265d02949feea6c72c5
https://github.com/Dolibarr/dolibarr/commit/c391ca5b329e2b45ab9f8265d02949feea6c72c5
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/opensurvey/card.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
Log Message:
-----------
Uniformize presentation on opensurvey
Commit: c442ff0d2b634d43a4871f93b7b6d5de3b91afb9
https://github.com/Dolibarr/dolibarr/commit/c442ff0d2b634d43a4871f93b7b6d5de3b91afb9
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/core/modules/modUser.class.php
Log Message:
-----------
Fix: Missing language file for user export when the module members is on
Commit: b5771ebbfc2a67f5eec7ecb3c7a31f714758f74b
https://github.com/Dolibarr/dolibarr/commit/b5771ebbfc2a67f5eec7ecb3c7a31f714758f74b
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Fix: Missing language key for bank export
Commit: 8028b779663c78dd877faa7d6c57aeff1829fd6b
https://github.com/Dolibarr/dolibarr/commit/8028b779663c78dd877faa7d6c57aeff1829fd6b
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Fix: MIssing language file for category members export
Commit: cdd84244b2c931fe55e3cf5617da8d3ce0ef88b0
https://github.com/Dolibarr/dolibarr/commit/cdd84244b2c931fe55e3cf5617da8d3ce0ef88b0
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Fix: Missing Language file and key for category contact export
Commit: b52648674dfb941204910aa48b4ee3d46ede8f79
https://github.com/Dolibarr/dolibarr/commit/b52648674dfb941204910aa48b4ee3d46ede8f79
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/contact/card.php
M htdocs/contact/perso.php
Log Message:
-----------
Uniformize presentation on contact
Commit: 4e39c41215854c40493cd6b7433630e50aeb5571
https://github.com/Dolibarr/dolibarr/commit/4e39c41215854c40493cd6b7433630e50aeb5571
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
Fix: Typo on invoice export
Commit: 26df66f9ac5960d6a1a5287a7489700e5049559d
https://github.com/Dolibarr/dolibarr/commit/26df66f9ac5960d6a1a5287a7489700e5049559d
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/core/modules/modSalaries.class.php
Log Message:
-----------
Fix: Missing language file for salaries export
Commit: 1313ef99d534eba222f4ef77c33f0e2e9604c400
https://github.com/Dolibarr/dolibarr/commit/1313ef99d534eba222f4ef77c33f0e2e9604c400
Author: aspangaro <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/categories/card.php
M htdocs/categories/viewcat.php
Log Message:
-----------
Uniformize presentation on categories
Commit: e9962bb887eb3c3baf40983834fe3826059e4099
https://github.com/Dolibarr/dolibarr/commit/e9962bb887eb3c3baf40983834fe3826059e4099
Author: florian HENRY <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
fix export
Commit: 07412b2f79fa2327a30269c9d2d15e2d61dacbd0
https://github.com/Dolibarr/dolibarr/commit/07412b2f79fa2327a30269c9d2d15e2d61dacbd0
Author: florian HENRY <address@hidden>
Date: 2016-08-10 (Wed, 10 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/export.php
Log Message:
-----------
force export txt for ciel and quadratus
Commit: 55a83f9d8d59073a46929920babfcf0283abf940
https://github.com/Dolibarr/dolibarr/commit/55a83f9d8d59073a46929920babfcf0283abf940
Author: aspangaro <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Fix: Accountancy - Problem to define account_parent for an accounting account
& presentation
Commit: 300da71b9c7a466884d8a75c7a7839d7e1588124
https://github.com/Dolibarr/dolibarr/commit/300da71b9c7a466884d8a75c7a7839d7e1588124
Author: aspangaro <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Replace with 0
Commit: f674b249450b07a3e6bdfbcb820c6cbc98510548
https://github.com/Dolibarr/dolibarr/commit/f674b249450b07a3e6bdfbcb820c6cbc98510548
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/compta/payment_sc/card.php
Log Message:
-----------
Fix look and feel
Commit: 7cc7ac54856f0886831f78a1a005404313b0651d
https://github.com/Dolibarr/dolibarr/commit/7cc7ac54856f0886831f78a1a005404313b0651d
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/core/modules/printing/printgcp.modules.php
Log Message:
-----------
Fix translation
Commit: 4df9af1ba0325d2beb7d1615e91580f17dea9add
https://github.com/Dolibarr/dolibarr/commit/4df9af1ba0325d2beb7d1615e91580f17dea9add
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/compta/paiement/list.php
M htdocs/compta/tva/card.php
M htdocs/compta/tva/reglement.php
Log Message:
-----------
Fix several errors with bank account module enabled on sale tax edition
Commit: 86c90ade3fc035de05358b617025f9220b953c88
https://github.com/Dolibarr/dolibarr/commit/86c90ade3fc035de05358b617025f9220b953c88
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/compta/salaries/index.php
M htdocs/compta/tva/reglement.php
Log Message:
-----------
Another fix on bank account missing when bank module enabled.
Commit: bf2955909af20976ec5b853365d8e88abf6b35a3
https://github.com/Dolibarr/dolibarr/commit/bf2955909af20976ec5b853365d8e88abf6b35a3
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #5600 from atm-florian/FIX_5594
Fix 5594
Commit: 5ac175b7e4a91d888da9e0c3dfb59e64e64b6f82
https://github.com/Dolibarr/dolibarr/commit/5ac175b7e4a91d888da9e0c3dfb59e64e64b6f82
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/index.php
M htdocs/compta/bank/account.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #5602 from aspangaro/4.0-p38
FIX : Accountancy - BANK_DISABLE_DIRECT_INPUT Add an option
Commit: adc0a73e93fbb18c0a40110acbce6adcf4cea849
https://github.com/Dolibarr/dolibarr/commit/adc0a73e93fbb18c0a40110acbce6adcf4cea849
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge pull request #5603 from
atm-florian/4.0_FIX_Multicurrency_with_french_number_setting
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
Commit: 3b509db141c8e42c4f72853f58c7261b80be6128
https://github.com/Dolibarr/dolibarr/commit/3b509db141c8e42c4f72853f58c7261b80be6128
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/fichinter/card.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #5604 from atm-florian/FIX_createpropalfromproject
FIX : create proposal from project
Commit: 0907465fcf7b16ea5c2d363648e9aecf195b4f2c
https://github.com/Dolibarr/dolibarr/commit/0907465fcf7b16ea5c2d363648e9aecf195b4f2c
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Merge pull request #5615 from aspangaro/4.0-p41
Fix: Accountancy - Problem to define account_parent for an accounting account +
presentation
Commit: 5c92cc7fa3198408f933b1e3d2808e7c9c4bad89
https://github.com/Dolibarr/dolibarr/commit/5c92cc7fa3198408f933b1e3d2808e7c9c4bad89
Author: Juanjo Menent <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Merge pull request #5613 from atm-florian/40_accountancy
fix export
Commit: f9a9d4d2d82698b8d6e3057a551a8700a7d471ec
https://github.com/Dolibarr/dolibarr/commit/f9a9d4d2d82698b8d6e3057a551a8700a7d471ec
Author: fappels <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Fix sellby without hour check
Commit: b6f9aa4592b62e853a64ee8243af985f11fbb5d0
https://github.com/Dolibarr/dolibarr/commit/b6f9aa4592b62e853a64ee8243af985f11fbb5d0
Author: fappels <address@hidden>
Date: 2016-08-11 (Thu, 11 Aug 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix SQL error insert supplier order line
$this->fk_multicurrency not set gives SQL error
Commit: b7420372b7ea8d39fc043caeec25ad195921c7aa
https://github.com/Dolibarr/dolibarr/commit/b7420372b7ea8d39fc043caeec25ad195921c7aa
Author: aspangaro <address@hidden>
Date: 2016-08-12 (Fri, 12 Aug 2016)
Changed paths:
M htdocs/compta/bank/card.php
M htdocs/compta/sociales/charges.php
M htdocs/product/card.php
M htdocs/product/stock/card.php
M htdocs/resource/add.php
Log Message:
-----------
Uniformize presentation, add button cancel everywhere
Commit: aa17564e93bbfbb2617f8c7eb564596ebf584172
https://github.com/Dolibarr/dolibarr/commit/aa17564e93bbfbb2617f8c7eb564596ebf584172
Author: florian HENRY <address@hidden>
Date: 2016-08-16 (Tue, 16 Aug 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX: #5594
Commit: 3932a32399270553f48e285e35c5fff5f00a2f1c
https://github.com/Dolibarr/dolibarr/commit/3932a32399270553f48e285e35c5fff5f00a2f1c
Author: florian HENRY <address@hidden>
Date: 2016-08-16 (Tue, 16 Aug 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : #5629 PgSQL Interger string stylish error
Commit: 0ac090e9591c1bf61013f9ae806439de1b68114f
https://github.com/Dolibarr/dolibarr/commit/0ac090e9591c1bf61013f9ae806439de1b68114f
Author: florian HENRY <address@hidden>
Date: 2016-08-16 (Tue, 16 Aug 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid
input syntax for integer: ""
Commit: c385b86793e2760108eb322625ee56cf224be10b
https://github.com/Dolibarr/dolibarr/commit/c385b86793e2760108eb322625ee56cf224be10b
Author: Josep Lluís <address@hidden>
Date: 2016-08-16 (Tue, 16 Aug 2016)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVERY_DATE
In title and in filter the delivery date column is well hidden.
The error is only in column value,
Commit: a1323756a96d78f6ba27cfc21836be69756ad543
https://github.com/Dolibarr/dolibarr/commit/a1323756a96d78f6ba27cfc21836be69756ad543
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
FIX : in PgSQL no quote "word style" is permitted around column name
Commit: 6724901b9ec69fd9c4ba096e2d07893262ebc31f
https://github.com/Dolibarr/dolibarr/commit/6724901b9ec69fd9c4ba096e2d07893262ebc31f
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/boxes/modules_boxes.php
Log Message:
-----------
Fix closing td
Commit: 47489265b13277bcb8718a599d27edd8e5099090
https://github.com/Dolibarr/dolibarr/commit/47489265b13277bcb8718a599d27edd8e5099090
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/projet/element.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ba8c2dbf9fff701cfb35c848f4efe7615191ce1b
https://github.com/Dolibarr/dolibarr/commit/ba8c2dbf9fff701cfb35c848f4efe7615191ce1b
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/modules/modHRM.class.php
M htdocs/langs/en_US/multicurrency.lang
M htdocs/public/demo/index.php
Log Message:
-----------
Fix order of module for demo.
Commit: caa0dd75aa38faf16d90e9fa11576d7da0644a7b
https://github.com/Dolibarr/dolibarr/commit/caa0dd75aa38faf16d90e9fa11576d7da0644a7b
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/class/html.formother.class.php
M htdocs/langs/en_US/boxes.lang
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix responsive design on small smartphone
Commit: 2afc567a5304660232f6f1932923980c56fb2660
https://github.com/Dolibarr/dolibarr/commit/2afc567a5304660232f6f1932923980c56fb2660
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/contrat/list.php
Log Message:
-----------
Fix fiter on contract date
Commit: 0cb7440647c72a218aa505cb036c97801c50fda3
https://github.com/Dolibarr/dolibarr/commit/0cb7440647c72a218aa505cb036c97801c50fda3
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
Merge pull request #5635 from joseplluis/patch-3
Fix Bug: delivery date value is not hide with global ORDER_DISABLE_DELIVE…
Commit: 282c50ef34b5983585b95cc1dff8d481386ea2e4
https://github.com/Dolibarr/dolibarr/commit/282c50ef34b5983585b95cc1dff8d481386ea2e4
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #5631 from atm-florian/4.0
FIX #5594
Commit: 00443dae3ac6ae0bea1f71472a367cce9f4f5453
https://github.com/Dolibarr/dolibarr/commit/00443dae3ac6ae0bea1f71472a367cce9f4f5453
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/commande/list.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
Commit: 5c51cb0f29c6aa8e844cd16c575dedc56282dc3b
https://github.com/Dolibarr/dolibarr/commit/5c51cb0f29c6aa8e844cd16c575dedc56282dc3b
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/resource/class/resource.class.php
Log Message:
-----------
FIX : PgSQL Module Ressource list crash #5637
Commit: 63c54259918be35ceb16d74d3c0c835f9eaba8b6
https://github.com/Dolibarr/dolibarr/commit/63c54259918be35ceb16d74d3c0c835f9eaba8b6
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
another fix for Ressource module in PgSQL
Commit: 90c918bec6ec59459ef3d40e00fc0866620c6920
https://github.com/Dolibarr/dolibarr/commit/90c918bec6ec59459ef3d40e00fc0866620c6920
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/compta/paiement/list.php
M htdocs/compta/payment_sc/card.php
M htdocs/compta/salaries/index.php
M htdocs/compta/tva/card.php
M htdocs/compta/tva/reglement.php
M htdocs/contrat/list.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/modules/modHRM.class.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/multicurrency.lang
M htdocs/public/demo/index.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Commit: ddc480b6c90aa10b83c8b6fb5d48eb37ba41bfbc
https://github.com/Dolibarr/dolibarr/commit/ddc480b6c90aa10b83c8b6fb5d48eb37ba41bfbc
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/resource/class/resource.class.php
Log Message:
-----------
other fix for PgSQL and style
Commit: f7bb2483d8436adac643de02595ed7ccbae2da5b
https://github.com/Dolibarr/dolibarr/commit/f7bb2483d8436adac643de02595ed7ccbae2da5b
Author: florian HENRY <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
fix ressource for PGSQL
Commit: 33ceb5d62695185af63886a619a275342e4b7838
https://github.com/Dolibarr/dolibarr/commit/33ceb5d62695185af63886a619a275342e4b7838
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/fourn/card.php
M htdocs/margin/tabs/productMargins.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/facture.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #5601 from aspangaro/4.0-p37
Uniformize title presentation on product/service card
Commit: eea175b7e70b6582f51495e5bb1ccb218b42ea11
https://github.com/Dolibarr/dolibarr/commit/eea175b7e70b6582f51495e5bb1ccb218b42ea11
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/opensurvey/card.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
Log Message:
-----------
Merge pull request #5605 from aspangaro/4.0-p39
Uniformize presentation on opensurvey
Commit: 69e6f6a4891e97c56247a4f7ccf16744fa086b83
https://github.com/Dolibarr/dolibarr/commit/69e6f6a4891e97c56247a4f7ccf16744fa086b83
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/categories/card.php
M htdocs/categories/viewcat.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Merge pull request #5608 from aspangaro/4.0-p40
Fix: Some problems on export with language
Commit: 58fc64982f1d45837d3f422252b92aa67bf0dba3
https://github.com/Dolibarr/dolibarr/commit/58fc64982f1d45837d3f422252b92aa67bf0dba3
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Merge pull request #5618 from fappels/4.0_fix_eatby_sellby_check
Fix sellby without hour check
Commit: 660fcacef273d4765370fe628a95d7a90bd97d8e
https://github.com/Dolibarr/dolibarr/commit/660fcacef273d4765370fe628a95d7a90bd97d8e
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #5619 from
fappels/4.0_fix_sql_error_insert_supplier_order_line
Fix SQL error insert supplier order line
Commit: 88afc4ad5a59344a1bceda6282a187b6fa9d46a9
https://github.com/Dolibarr/dolibarr/commit/88afc4ad5a59344a1bceda6282a187b6fa9d46a9
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/compta/bank/card.php
M htdocs/compta/sociales/charges.php
M htdocs/product/card.php
M htdocs/product/stock/card.php
M htdocs/resource/add.php
Log Message:
-----------
Merge pull request #5625 from aspangaro/4.0-p42
Uniformize presentation, add button cancel everywhere
Commit: f9d707ff481e7e32952df68b6dcca34cbe4d941d
https://github.com/Dolibarr/dolibarr/commit/f9d707ff481e7e32952df68b6dcca34cbe4d941d
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge pull request #5630 from atm-florian/3.9
FIX : #5629 PgSQL Interger string stylish error
Commit: 7e8b8e9462761d912b32b4045238bb336fcaec74
https://github.com/Dolibarr/dolibarr/commit/7e8b8e9462761d912b32b4045238bb336fcaec74
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/resource/class/resource.class.php
Log Message:
-----------
Merge pull request #5638 from atm-florian/3.9_fix_5637
FIX : PgSQL Module Ressource list crash #5637
Commit: fead7967f2b84ce3c88e8128e4d92d4a2a1d8398
https://github.com/Dolibarr/dolibarr/commit/fead7967f2b84ce3c88e8128e4d92d4a2a1d8398
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/commande/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/resource/class/resource.class.php
Commit: 137f1c4e4fe1109fb3a626fde1c36812d850d326
https://github.com/Dolibarr/dolibarr/commit/137f1c4e4fe1109fb3a626fde1c36812d850d326
Author: florian HENRY <address@hidden>
Date: 2016-08-18 (Thu, 18 Aug 2016)
Changed paths:
M htdocs/categories/card.php
M htdocs/categories/viewcat.php
M htdocs/compta/bank/card.php
M htdocs/compta/sociales/charges.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/companies.lang
M htdocs/margin/tabs/productMargins.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/facture.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/resource/add.php
M htdocs/resource/class/dolresource.class.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/resource/class/dolresource.class.php
Commit: 83107746ad77b89f83e6ba9a33825ff9e9c3b911
https://github.com/Dolibarr/dolibarr/commit/83107746ad77b89f83e6ba9a33825ff9e9c3b911
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-19 (Fri, 19 Aug 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix no way to fix the ref of recurring invoice when an error was done
into typing.
Commit: 919b73b4c472a548065c265c841781dce188d0b0
https://github.com/Dolibarr/dolibarr/commit/919b73b4c472a548065c265c841781dce188d0b0
Author: philippe grand <address@hidden>
Date: 2016-08-19 (Fri, 19 Aug 2016)
Changed paths:
M htdocs/admin/ihm.php
Log Message:
-----------
fix : translation
Commit: 9c22d94bd3897680210948aab5e15ed3c85aa157
https://github.com/Dolibarr/dolibarr/commit/9c22d94bd3897680210948aab5e15ed3c85aa157
Author: philippe grand <address@hidden>
Date: 2016-08-19 (Fri, 19 Aug 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
fix : bad sort
Commit: f06545a3fe30abc517e7ad5f2faf4cd5706933ca
https://github.com/Dolibarr/dolibarr/commit/f06545a3fe30abc517e7ad5f2faf4cd5706933ca
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-19 (Fri, 19 Aug 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Fix cancel button ignored
Commit: 1fc571504021019de1703acd3a4931c75018ceaa
https://github.com/Dolibarr/dolibarr/commit/1fc571504021019de1703acd3a4931c75018ceaa
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-20 (Sat, 20 Aug 2016)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Fix date of contract not used
Commit: 0839a9fa4f99e5e587d369b3bc54156829402684
https://github.com/Dolibarr/dolibarr/commit/0839a9fa4f99e5e587d369b3bc54156829402684
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-20 (Sat, 20 Aug 2016)
Changed paths:
M htdocs/core/lib/geturl.lib.php
Log Message:
-----------
Code comment
Commit: 317132fea49138fb123fcdfcff93b00a92635566
https://github.com/Dolibarr/dolibarr/commit/317132fea49138fb123fcdfcff93b00a92635566
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-22 (Mon, 22 Aug 2016)
Changed paths:
M htdocs/compta/payment_sc/card.php
Log Message:
-----------
CSS
Commit: ab4997d26f7d70634e28ce05f611b3e2b217ddda
https://github.com/Dolibarr/dolibarr/commit/ab4997d26f7d70634e28ce05f611b3e2b217ddda
Author: florian HENRY <address@hidden>
Date: 2016-08-22 (Mon, 22 Aug 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/geturl.lib.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Commit: 6b3cbc918dfca1d2800f2286699e6679825a489a
https://github.com/Dolibarr/dolibarr/commit/6b3cbc918dfca1d2800f2286699e6679825a489a
Author: Regis Houssin <address@hidden>
Date: 2016-08-22 (Mon, 22 Aug 2016)
Changed paths:
M htdocs/cron/class/cronjob.class.php
Log Message:
-----------
Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or
"function"
Commit: b81de6b383701f524e92418519d368264594b9b2
https://github.com/Dolibarr/dolibarr/commit/b81de6b383701f524e92418519d368264594b9b2
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-24 (Wed, 24 Aug 2016)
Changed paths:
M htdocs/public/test/test_arrays.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix wrapping with jmobile
Commit: 848d046b46691d51ecf118e5c7c59d578d838a07
https://github.com/Dolibarr/dolibarr/commit/848d046b46691d51ecf118e5c7c59d578d838a07
Author: florian HENRY <address@hidden>
Date: 2016-08-25 (Thu, 25 Aug 2016)
Changed paths:
M htdocs/compta/payment_sc/card.php
M htdocs/public/test/test_arrays.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Commit: c298bb62baa0248acc5ae70b8899550378b48f59
https://github.com/Dolibarr/dolibarr/commit/c298bb62baa0248acc5ae70b8899550378b48f59
Author: Juanjo Menent <address@hidden>
Date: 2016-08-25 (Thu, 25 Aug 2016)
Changed paths:
M htdocs/admin/ihm.php
Log Message:
-----------
Merge pull request #5644 from grandoc/3.9
fix : translation
Commit: ed25c0fda5eccabb3e796439397ee7a21596d26a
https://github.com/Dolibarr/dolibarr/commit/ed25c0fda5eccabb3e796439397ee7a21596d26a
Author: Juanjo Menent <address@hidden>
Date: 2016-08-25 (Thu, 25 Aug 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Merge pull request #5645 from grandoc/4.0
fix : bad sort
Commit: 9c4d60fd5d01728d5109437e79c19ae2aabe3c6a
https://github.com/Dolibarr/dolibarr/commit/9c4d60fd5d01728d5109437e79c19ae2aabe3c6a
Author: Juanjo Menent <address@hidden>
Date: 2016-08-25 (Thu, 25 Aug 2016)
Changed paths:
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
Merge pull request #5639 from atm-florian/4.0
fix ressource module for PGSQL and coding style
Commit: 874db10dbe8a370fa8cd67c694042b10fdc18612
https://github.com/Dolibarr/dolibarr/commit/874db10dbe8a370fa8cd67c694042b10fdc18612
Author: Juanjo Menent <address@hidden>
Date: 2016-08-25 (Thu, 25 Aug 2016)
Changed paths:
M htdocs/cron/class/cronjob.class.php
Log Message:
-----------
Merge pull request #5648 from hregis/3.8_bug
Fix: wrong "lastoutput" and "lastresult" if jobtype is "method" or "function"
Commit: 9f40f346cb2f88b08420a8fa3dadf0ac3b65dc6c
https://github.com/Dolibarr/dolibarr/commit/9f40f346cb2f88b08420a8fa3dadf0ac3b65dc6c
Author: aspangaro <address@hidden>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M htdocs/don/index.php
Log Message:
-----------
Fix: Presentation of Donations Area and add search
Commit: e7c05a778b1677a552a7f78e0991c225658dedf3
https://github.com/Dolibarr/dolibarr/commit/e7c05a778b1677a552a7f78e0991c225658dedf3
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/don/index.php
Log Message:
-----------
Merge pull request #5662 from aspangaro/4.0-p43
Fix: Presentation of Donations Area and add search
Commit: 5d7414dcc3d3dd740adbb66464474fb90137d0f5
https://github.com/Dolibarr/dolibarr/commit/5d7414dcc3d3dd740adbb66464474fb90137d0f5
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Solve php regression failing travis
Commit: bc8e20301984f9f732733a2cffb08571b2623c1a
https://github.com/Dolibarr/dolibarr/commit/bc8e20301984f9f732733a2cffb08571b2623c1a
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/core/lib/functions2.lib.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/pgsql/functions/functions.sql
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 0d992b2b99125c142e3112dae60ac5f8221ee942
https://github.com/Dolibarr/dolibarr/commit/0d992b2b99125c142e3112dae60ac5f8221ee942
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/core/lib/functions2.lib.php
M htdocs/cron/class/cronjob.class.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/cron/class/cronjob.class.php
htdocs/install/pgsql/functions/functions.sql
Commit: 72ccedba98ab51de3ec239e02427badf40bb3566
https://github.com/Dolibarr/dolibarr/commit/72ccedba98ab51de3ec239e02427badf40bb3566
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/don/index.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: fac28f9589a74b3f5edb3b5b841bb215999cfc60
https://github.com/Dolibarr/dolibarr/commit/fac28f9589a74b3f5edb3b5b841bb215999cfc60
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/index.php
M htdocs/adherents/list.php
M htdocs/admin/ihm.php
M htdocs/categories/card.php
M htdocs/categories/viewcat.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/card.php
M htdocs/compta/charges/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/list.php
M htdocs/compta/payment_sc/card.php
M htdocs/compta/salaries/index.php
M htdocs/compta/tva/card.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/card.php
M htdocs/contact/perso.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/geturl.lib.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modHRM.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/index.php
M htdocs/fichinter/card.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/multicurrency.lang
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/margin/tabs/productMargins.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/facture.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/projet/element.php
M htdocs/public/demo/index.php
M htdocs/public/test/test_arrays.php
M htdocs/resource/add.php
M htdocs/resource/class/dolresource.class.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/54378bc07b50...fac28f9589a7