[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 600a10: Merge remote-tracking branch
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 600a10: Merge remote-tracking branch 'upstream/3.9' into 3... |
Date: |
Sat, 01 Oct 2016 09:58:00 -0700 |
Branch: refs/heads/3.9_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 600a10fa16fac32304808d5d0c6958fb4c33c920
https://github.com/Dolibarr/dolibarr/commit/600a10fa16fac32304808d5d0c6958fb4c33c920
Author: Juanjo Menent <address@hidden>
Date: 2016-07-25 (Mon, 25 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 9e67249b98301441e7f9efe87c3de98642f8eafb
https://github.com/Dolibarr/dolibarr/commit/9e67249b98301441e7f9efe87c3de98642f8eafb
Author: Juanjo Menent <address@hidden>
Date: 2016-07-25 (Mon, 25 Jul 2016)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
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: aadf52fe59afcb08df33c5b4f51f8d64652a5316
https://github.com/Dolibarr/dolibarr/commit/aadf52fe59afcb08df33c5b4f51f8d64652a5316
Author: Juanjo Menent <address@hidden>
Date: 2016-08-03 (Wed, 03 Aug 2016)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/don/card.php
M htdocs/filefunc.inc.php
M htdocs/fourn/facture/list.php
M htdocs/product/admin/product.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
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: 1253b7387989573b9711bc53cd3a0116ba4a9ed8
https://github.com/Dolibarr/dolibarr/commit/1253b7387989573b9711bc53cd3a0116ba4a9ed8
Author: Juanjo Menent <address@hidden>
Date: 2016-08-04 (Thu, 04 Aug 2016)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: a9e5668ea4b4444c8d86b1cfd49d226a1990f27d
https://github.com/Dolibarr/dolibarr/commit/a9e5668ea4b4444c8d86b1cfd49d226a1990f27d
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-28 (Sun, 28 Aug 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix for jmobile
Commit: b1401d65666fd693a91b500a1ac36fdcfe77d754
https://github.com/Dolibarr/dolibarr/commit/b1401d65666fd693a91b500a1ac36fdcfe77d754
Author: Juanjo Menent <address@hidden>
Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/commande/list.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/lib/functions2.lib.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/barcode/modules_barcode.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/stock/product.php
M htdocs/resource/class/resource.class.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: 18cf2f8f8b04a50e2f8c7eb4f604b2eb01907020
https://github.com/Dolibarr/dolibarr/commit/18cf2f8f8b04a50e2f8c7eb4f604b2eb01907020
Author: gauthier <address@hidden>
Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
FIX : header title in commercial area
Commit: 10ced563b30063f6faaa2cbf2689f907c6bdff97
https://github.com/Dolibarr/dolibarr/commit/10ced563b30063f6faaa2cbf2689f907c6bdff97
Author: Laurent Destailleur <address@hidden>
Date: 2016-08-31 (Wed, 31 Aug 2016)
Changed paths:
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
Fix var $conf not defined
Commit: 1c626c01eee96e1720e3aee0bd3fa3555c1d4645
https://github.com/Dolibarr/dolibarr/commit/1c626c01eee96e1720e3aee0bd3fa3555c1d4645
Author: fappels <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Ignore time when checking lot dates
Commit: 416a0892d75438a4083c94176d803a5c723d8fa9
https://github.com/Dolibarr/dolibarr/commit/416a0892d75438a4083c94176d803a5c723d8fa9
Author: Ferran Marcet <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Fix: An empty variable is used to update multiprice
Commit: fcd5e1fb2c529a5eb9c5e501c23094bab5e9a05e
https://github.com/Dolibarr/dolibarr/commit/fcd5e1fb2c529a5eb9c5e501c23094bab5e9a05e
Author: phf <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix lost value if use double quote
Commit: 5dc7c9c6e56becd57b0135a86274317b7d1f5dae
https://github.com/Dolibarr/dolibarr/commit/5dc7c9c6e56becd57b0135a86274317b7d1f5dae
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Merge pull request #5691 from fappels/3.9_fix_check_lot_dates
FIX #5642 Ignore time when checking lot dates
Commit: 570c228ee13e8da215d5208f0d6321df50b7d689
https://github.com/Dolibarr/dolibarr/commit/570c228ee13e8da215d5208f0d6321df50b7d689
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #5692 from fmarcet/3.9
Fix: An empty variable is used to update multiprice
Commit: d6a4b58a689882bce5796c0dbc9e229b5052ba87
https://github.com/Dolibarr/dolibarr/commit/d6a4b58a689882bce5796c0dbc9e229b5052ba87
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/comm/index.php
Log Message:
-----------
Merge pull request #5685 from
atm-gauthier/3.8_fix_header_title_commercial_area
FIX : header title in commercial area
Commit: 5c2af9b7bd46c96db9fcc1119238085ab7378e7c
https://github.com/Dolibarr/dolibarr/commit/5c2af9b7bd46c96db9fcc1119238085ab7378e7c
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #5694 from atm-ph/fix_3.8_address_empty
Fix lost value if use double quote
Commit: 70de814c3c741101bb67f32264724d6c726d17d0
https://github.com/Dolibarr/dolibarr/commit/70de814c3c741101bb67f32264724d6c726d17d0
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/comm/index.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 696b54c6c3db4d9655b52296e2f697e06472e3bd
https://github.com/Dolibarr/dolibarr/commit/696b54c6c3db4d9655b52296e2f697e06472e3bd
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 9c8145eb885059218815bd4efa92e252aa4c4e23
https://github.com/Dolibarr/dolibarr/commit/9c8145eb885059218815bd4efa92e252aa4c4e23
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Better fix for 416a0892d75438a4083c94176d803a5c723d8fa9
Commit: 78b2e9e4bfc0838051e588345070bd15081d97b2
https://github.com/Dolibarr/dolibarr/commit/78b2e9e4bfc0838051e588345070bd15081d97b2
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/webservices/server_contact.php
Log Message:
-----------
FIX #5651
Commit: e19743519b85de9baf3b4d03a0bfd4c3a81ce212
https://github.com/Dolibarr/dolibarr/commit/e19743519b85de9baf3b4d03a0bfd4c3a81ce212
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-02 (Fri, 02 Sep 2016)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
FIX #5660
Commit: 4e5105c2201c3b5c0c9969ae460eea34dc123d09
https://github.com/Dolibarr/dolibarr/commit/4e5105c2201c3b5c0c9969ae460eea34dc123d09
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/comm/index.php
M htdocs/commande/list.php
M htdocs/compta/prelevement/class/bonprelevement.class.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/lib/functions2.lib.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/barcode/modules_barcode.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/soc.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_order.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.9' into 3.9
Commit: d2ef56f3f10a87953134d666e9b96ed67f05ad18
https://github.com/Dolibarr/dolibarr/commit/d2ef56f3f10a87953134d666e9b96ed67f05ad18
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 3.9
Commit: 3078e6fa4b8a76fbf0d2ff98ab6ad2ee86a4a2fe
https://github.com/Dolibarr/dolibarr/commit/3078e6fa4b8a76fbf0d2ff98ab6ad2ee86a4a2fe
Author: Juanjo Menent <address@hidden>
Date: 2016-09-06 (Tue, 06 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: vat dictionary should allow enter and edit multiple values for
localtaxes, separated by: (ex -19:-15)
Commit: 5de88f6af1f1c74d4088bc816c53fefc4a05a2ed
https://github.com/Dolibarr/dolibarr/commit/5de88f6af1f1c74d4088bc816c53fefc4a05a2ed
Author: Regis Houssin <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: increase max-width when use externals modules
Commit: 972a2db3a365752d958ade11ef24083c1e5f9653
https://github.com/Dolibarr/dolibarr/commit/972a2db3a365752d958ade11ef24083c1e5f9653
Author: Philippe <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
No initialisation of the array before filling it. May cause some trouble
when fetch is call several times and lines added or deleted
Commit: b72794216eb611bcd001fe2575f5045d37c6e3f9
https://github.com/Dolibarr/dolibarr/commit/b72794216eb611bcd001fe2575f5045d37c6e3f9
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #5702 from simnandez/3.8
FIX: vat dictionary should allow enter and edit multiple values for localtaxes,
separated by: (ex -19:-15)
Commit: ff632718fa7bc7d217cb86548fbbde7e2587eead
https://github.com/Dolibarr/dolibarr/commit/ff632718fa7bc7d217cb86548fbbde7e2587eead
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #5719 from philippe-opendsi/3.8_patch_1
FIX #5705 Supplier Order's lines array initalisation
Commit: e3c2299c674a61dd182dcae3d4bb4abbf997cbea
https://github.com/Dolibarr/dolibarr/commit/e3c2299c674a61dd182dcae3d4bb4abbf997cbea
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
htdocs/admin/dict.php
htdocs/fourn/class/fournisseur.commande.class.php
Commit: b5db70342bfd94a27c904f355d73b6e251e1b6a6
https://github.com/Dolibarr/dolibarr/commit/b5db70342bfd94a27c904f355d73b6e251e1b6a6
Author: Ferran Marcet <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Fix: Search all is lost on lists when pagination or when the columns are
sorted
Commit: 4777faf49bdd70df9f99a3ffd0ce33825b0a420f
https://github.com/Dolibarr/dolibarr/commit/4777faf49bdd70df9f99a3ffd0ce33825b0a420f
Author: Ferran Marcet <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/product/stock/list.php
Log Message:
-----------
Fix: Search all is lost on lists when pagination or when the columns are
sorted
Commit: 87fb00c293871ab62c238ccde6c1fb1e8628425e
https://github.com/Dolibarr/dolibarr/commit/87fb00c293871ab62c238ccde6c1fb1e8628425e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge pull request #5727 from fmarcet/3.9
Fix: Search all is lost on lists when pagination or when the columns…
Commit: f5884999a9984b2f5e75c8020c8f470b65481c61
https://github.com/Dolibarr/dolibarr/commit/f5884999a9984b2f5e75c8020c8f470b65481c61
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #5716 from hregis/3.9_bug
Fix: increase max-width when use externals modules
Commit: da41c3ffa7935c8c7de108f9838d9003eb93e454
https://github.com/Dolibarr/dolibarr/commit/da41c3ffa7935c8c7de108f9838d9003eb93e454
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix better fix to increase size of login_block to allow external icon.
Commit: 3d8722ee6954061f376b50fe8403c56bdc4c24a7
https://github.com/Dolibarr/dolibarr/commit/3d8722ee6954061f376b50fe8403c56bdc4c24a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/compta/localtax/index.php
Log Message:
-----------
FIX #2853
Commit: 40969813787f7d0dc72b76750a4d9c982ef1a77a
https://github.com/Dolibarr/dolibarr/commit/40969813787f7d0dc72b76750a4d9c982ef1a77a
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
FIX #3128
Commit: 1d95720644f85dfd24ece036918644daf9e41b14
https://github.com/Dolibarr/dolibarr/commit/1d95720644f85dfd24ece036918644daf9e41b14
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fixed product description field name in line edit.
The POST value 'desc' was never evaluated and caused fields to blank
out on update action.
Commit: b69f037dd34734082f4aff5458f9cc6af8cecdfe
https://github.com/Dolibarr/dolibarr/commit/b69f037dd34734082f4aff5458f9cc6af8cecdfe
Author: Juanjo Menent <address@hidden>
Date: 2016-09-14 (Wed, 14 Sep 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge pull request #5740 from GPCsolutions/3.9-lineedit
Fixed product description field name in line edit.
Commit: 5840ed825827424b8d8d5a9ac435db88af29740a
https://github.com/Dolibarr/dolibarr/commit/5840ed825827424b8d8d5a9ac435db88af29740a
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-09-15 (Thu, 15 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
No ORDER BY needed for a COUNT sql, causes PGSQL error
Commit: bef5c2748c804b26a1c9ed584bfe5df03d7744d9
https://github.com/Dolibarr/dolibarr/commit/bef5c2748c804b26a1c9ed584bfe5df03d7744d9
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-17 (Sat, 17 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
Merge pull request #5756 from atm-maxime/fix_pgsql_supplierorder_list
FIX No ORDER BY needed for a COUNT sql, causes PGSQL error
Commit: 937f1fd3ee8948abeff4b54498df716c87665611
https://github.com/Dolibarr/dolibarr/commit/937f1fd3ee8948abeff4b54498df716c87665611
Author: Regis Houssin <address@hidden>
Date: 2016-09-20 (Tue, 20 Sep 2016)
Changed paths:
M htdocs/core/actions_sendmails.inc.php
Log Message:
-----------
Fix: Using $this when not in object context
Commit: f1bb69eecfa1c9346e9dd8b2a670272fe1411567
https://github.com/Dolibarr/dolibarr/commit/f1bb69eecfa1c9346e9dd8b2a670272fe1411567
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-21 (Wed, 21 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 2c42697cae419b79058f582b315ed821cf94808e
https://github.com/Dolibarr/dolibarr/commit/2c42697cae419b79058f582b315ed821cf94808e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-21 (Wed, 21 Sep 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: f9f95dec42b7ab7630502c5d07ecfe5268668bcb
https://github.com/Dolibarr/dolibarr/commit/f9f95dec42b7ab7630502c5d07ecfe5268668bcb
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-22 (Thu, 22 Sep 2016)
Changed paths:
M htdocs/core/actions_sendmails.inc.php
Log Message:
-----------
Merge pull request #5765 from hregis/3.9_bug
Fix: Using $this when not in object context
Commit: 4cccaae83125ff9f031e5c6fd9752c01a08cdc63
https://github.com/Dolibarr/dolibarr/commit/4cccaae83125ff9f031e5c6fd9752c01a08cdc63
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-25 (Sun, 25 Sep 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix warning
Commit: 8829db7d6517900c287f4d393f21b4a79bdad7c5
https://github.com/Dolibarr/dolibarr/commit/8829db7d6517900c287f4d393f21b4a79bdad7c5
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-25 (Sun, 25 Sep 2016)
Changed paths:
M htdocs/core/actions_sendmails.inc.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 67a1bf2b5938fb23009f6b1686bd884054f8dfd9
https://github.com/Dolibarr/dolibarr/commit/67a1bf2b5938fb23009f6b1686bd884054f8dfd9
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-26 (Mon, 26 Sep 2016)
Changed paths:
M htdocs/compta/localtax/index.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 8775a51cec16cec5191efb1016a6c97d5892d38e
https://github.com/Dolibarr/dolibarr/commit/8775a51cec16cec5191efb1016a6c97d5892d38e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-26 (Mon, 26 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 5d7f182f59486d19dd45ec4096bb10466b9bb416
https://github.com/Dolibarr/dolibarr/commit/5d7f182f59486d19dd45ec4096bb10466b9bb416
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-26 (Mon, 26 Sep 2016)
Changed paths:
M htdocs/compta/localtax/index.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 30050b51f0519b916643b08efdcdfca947664472
https://github.com/Dolibarr/dolibarr/commit/30050b51f0519b916643b08efdcdfca947664472
Author: Juanjo Menent <address@hidden>
Date: 2016-09-28 (Wed, 28 Sep 2016)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
FIX: Failed to export contact categories with contact extra fields
Commit: a90111cbf3c2bba49a09ea71a1152b0eee871183
https://github.com/Dolibarr/dolibarr/commit/a90111cbf3c2bba49a09ea71a1152b0eee871183
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-28 (Wed, 28 Sep 2016)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge pull request #5804 from simnandez/3.8
FIX: Failed to export contact categories with contact extra fields
Commit: 0b49d6316eb139efd6e8fbdd27720548c30999ec
https://github.com/Dolibarr/dolibarr/commit/0b49d6316eb139efd6e8fbdd27720548c30999ec
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-29 (Thu, 29 Sep 2016)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 9831f11e531b99d708f33f11d01acc86afcd7bbf
https://github.com/Dolibarr/dolibarr/commit/9831f11e531b99d708f33f11d01acc86afcd7bbf
Author: florian HENRY <address@hidden>
Date: 2016-09-30 (Fri, 30 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/admin/ihm.php
M htdocs/comm/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/index.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/actions_sendmails.inc.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/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/list.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/list.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_order.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 3.9_backported
Commit: e0f0874136e7b2e31d6e05a2b4b27ad64f19bfe8
https://github.com/Dolibarr/dolibarr/commit/e0f0874136e7b2e31d6e05a2b4b27ad64f19bfe8
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-01 (Sat, 01 Oct 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/admin/ihm.php
M htdocs/comm/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/index.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/actions_sendmails.inc.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/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/product/class/product.class.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/list.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/list.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_order.php
M test/phpunit/Functions2LibTest.php
Log Message:
-----------
Merge pull request #5819 from atm-florian/3.9_backported
3.9 backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/cc1a81a85144...e0f0874136e7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 600a10: Merge remote-tracking branch 'upstream/3.9' into 3...,
Laurent Destailleur <=