[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d0a1d2: Merge branch '3.6' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d0a1d2: Merge branch '3.6' of address@hidden:Dolibarr/doli... |
|
Date: |
Sat, 12 Sep 2015 02:39:12 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: d0a1d2c3a500e33c85662a1b7070167a92dd6e60
https://github.com/Dolibarr/dolibarr/commit/d0a1d2c3a500e33c85662a1b7070167a92dd6e60
Author: Florian HENRY <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
https://github.com/Dolibarr/dolibarr/commit/ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
Author: Florian HENRY <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
https://github.com/Dolibarr/dolibarr/commit/96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
Author: Florian HENRY <address@hidden>
Date: 2015-06-11 (Thu, 11 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: ac6619daef402ebefa6b36d9199145449cda54fe
https://github.com/Dolibarr/dolibarr/commit/ac6619daef402ebefa6b36d9199145449cda54fe
Author: Florian HENRY <address@hidden>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M ChangeLog
M htdocs/categories/edit.php
M htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
M htdocs/compta/bank/virement.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/install/upgrade2.php
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/liste.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 01d1c89f118787f97b3c19fbb2d590c5b2681f03
https://github.com/Dolibarr/dolibarr/commit/01d1c89f118787f97b3c19fbb2d590c5b2681f03
Author: Florian HENRY <address@hidden>
Date: 2015-07-15 (Wed, 15 Jul 2015)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/product/reassort.php
M htdocs/projet/liste.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 8d18507d5f73a89319587f30a6f74c7c2e02bc43
https://github.com/Dolibarr/dolibarr/commit/8d18507d5f73a89319587f30a6f74c7c2e02bc43
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Bad help
Commit: 58988d30840e6fc23a2f78e7206cb4abe7691bb5
https://github.com/Dolibarr/dolibarr/commit/58988d30840e6fc23a2f78e7206cb4abe7691bb5
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
3.5.8
Commit: 51d5bff15d761588e96808d1e448c2dfdbf0a874
https://github.com/Dolibarr/dolibarr/commit/51d5bff15d761588e96808d1e448c2dfdbf0a874
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-08-31 (Mon, 31 Aug 2015)
Changed paths:
M htdocs/core/boxes/box_prospect.php
Log Message:
-----------
Fix #3442 Remove useless syslog
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
Commit: 2b6a481011783d38c912b33268d79cc9e62be86e
https://github.com/Dolibarr/dolibarr/commit/2b6a481011783d38c912b33268d79cc9e62be86e
Author: fmarcet <address@hidden>
Date: 2015-09-01 (Tue, 01 Sep 2015)
Changed paths:
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
FIX: The hours of date filter aren't correct
Commit: 870882257da72e81848739f3482b22d48a59eb70
https://github.com/Dolibarr/dolibarr/commit/870882257da72e81848739f3482b22d48a59eb70
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-09-01 (Tue, 01 Sep 2015)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Fix #3448 Pass expected date format
Commit: e3d4b104e2375b4a63e47e2dfd14eeb244a558f6
https://github.com/Dolibarr/dolibarr/commit/e3d4b104e2375b4a63e47e2dfd14eeb244a558f6
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #3449 from GPCsolutions/3.5-3448
Fix #3448 Pass expected date format
Commit: 9efecbf52b9386cb5eac97519169a2e109369930
https://github.com/Dolibarr/dolibarr/commit/9efecbf52b9386cb5eac97519169a2e109369930
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M htdocs/core/boxes/box_prospect.php
Log Message:
-----------
Merge pull request #3443 from GPCsolutions/3.5-3442
Fix #3442 Remove useless syslog
Commit: 897686a7520b35ab3f7164183574bdcb2d5f3c00
https://github.com/Dolibarr/dolibarr/commit/897686a7520b35ab3f7164183574bdcb2d5f3c00
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge pull request #3447 from fmarcet/3.5
FIX: The hours of date filter aren't correct
Commit: 001f1b4c31393a7a1c1514ab335af7787555b044
https://github.com/Dolibarr/dolibarr/commit/001f1b4c31393a7a1c1514ab335af7787555b044
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/compta/index.php
M htdocs/core/boxes/box_prospect.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/filefunc.inc.php
Commit: 50184babb95a19ff01efb76696b3e3b60441af8f
https://github.com/Dolibarr/dolibarr/commit/50184babb95a19ff01efb76696b3e3b60441af8f
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing
invoice mask
Close #2893
Commit: 08565d46fec7daded48d1ac888f2d7cd5b134062
https://github.com/Dolibarr/dolibarr/commit/08565d46fec7daded48d1ac888f2d7cd5b134062
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/compta/index.php
M htdocs/core/boxes/box_prospect.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge branch '3.6' into bug-2893
Commit: bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
https://github.com/Dolibarr/dolibarr/commit/bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Updated changelog
Commit: 7a115c9366ea56e2239738e4cc023d17d96d6876
https://github.com/Dolibarr/dolibarr/commit/7a115c9366ea56e2239738e4cc023d17d96d6876
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Typo
Commit: 51a01921ba30f6219d6d9250ece8265dc3e4315e
https://github.com/Dolibarr/dolibarr/commit/51a01921ba30f6219d6d9250ece8265dc3e4315e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-03 (Thu, 03 Sep 2015)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #3456 from marcosgdf/bug-2893
Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice
mask
Commit: 8076ea85eab97f6c27859de0ed0b28f7ab8faf50
https://github.com/Dolibarr/dolibarr/commit/8076ea85eab97f6c27859de0ed0b28f7ab8faf50
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
3.6.4 was packaged
Commit: 6c78b930d154a22a5591c3c4b0e8319b948ce348
https://github.com/Dolibarr/dolibarr/commit/6c78b930d154a22a5591c3c4b0e8319b948ce348
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 7505537a3e74e294580f0395b337d65bcd81e2ae
https://github.com/Dolibarr/dolibarr/commit/7505537a3e74e294580f0395b337d65bcd81e2ae
Author: Florian HENRY <address@hidden>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/admin/dict.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/stats/index.php
M htdocs/compta/index.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/contact/exportimport.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/expedition/class/expedition.class.php
M htdocs/filefunc.inc.php
A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusansmono.z
A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
M htdocs/langs/en_US/errors.lang
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/projet/class/task.class.php
M htdocs/societe/consumption.php
M htdocs/societe/info.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 52cb9581ff0446e36300849ccfbd2470cf0d69fb
https://github.com/Dolibarr/dolibarr/commit/52cb9581ff0446e36300849ccfbd2470cf0d69fb
Author: Florian HENRY <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/liste.php
M htdocs/product/stock/product.php
Log Message:
-----------
Fix multientity stock management
Commit: 63a817c3a4d368beaff46e3bd72a456409446342
https://github.com/Dolibarr/dolibarr/commit/63a817c3a4d368beaff46e3bd72a456409446342
Author: Florian HENRY <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M htdocs/product/stock/index.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Fix wahrehouse multientty management
Commit: 355fcc78cf2fae81ebcc8aea7a86fadea9f803be
https://github.com/Dolibarr/dolibarr/commit/355fcc78cf2fae81ebcc8aea7a86fadea9f803be
Author: Juanjo Menent <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
Log Message:
-----------
Fix #3475 RemiseCheque: Undefined variable $date
Commit: 70df5538148cc8032d09fe396347e74f7701af34
https://github.com/Dolibarr/dolibarr/commit/70df5538148cc8032d09fe396347e74f7701af34
Author: Juanjo Menent <address@hidden>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/liste.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge pull request #3494 from FHenry/3.6
3.6
Commit: 249883dda2d6e5af6bbc50ac42a37bf1c75a2b67
https://github.com/Dolibarr/dolibarr/commit/249883dda2d6e5af6bbc50ac42a37bf1c75a2b67
Author: fappels <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/stats/index.php
M htdocs/compta/index.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/filefunc.inc.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/societe/info.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge remote-tracking branch 'Dolibarr/3.5' into 3.5
Commit: 8bdfdc0127ceabb2c1af3c4003ab9dbb08d62612
https://github.com/Dolibarr/dolibarr/commit/8bdfdc0127ceabb2c1af3c4003ab9dbb08d62612
Author: fappels <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Fix #3471 3.5 Rounding issue when dispatching non-integer
Commit: c6081f0fa2063324f9b040742ab6181bd3be3ceb
https://github.com/Dolibarr/dolibarr/commit/c6081f0fa2063324f9b040742ab6181bd3be3ceb
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-09-11 (Fri, 11 Sep 2015)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
Log Message:
-----------
Fix multientity stock management (F.Henry followup)
Commit: e1a92c8288ad41cbbf6f7f69afa53d7b0cd3ef74
https://github.com/Dolibarr/dolibarr/commit/e1a92c8288ad41cbbf6f7f69afa53d7b0cd3ef74
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
Log Message:
-----------
Merge pull request #3506 from atm-maxime/3.6
Fix multientity stock management (F.Henry followup)
Commit: a3032d56744c85b4af26ee6f90aa0c277a0d3ca6
https://github.com/Dolibarr/dolibarr/commit/a3032d56744c85b4af26ee6f90aa0c277a0d3ca6
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding
Fix #3471 3.5 Rounding issue when dispatching non-integer
Commit: 86b1a9cbcee8bb5f6f6acb48f54a2b39fe662f27
https://github.com/Dolibarr/dolibarr/commit/86b1a9cbcee8bb5f6f6acb48f54a2b39fe662f27
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 657a78ebe9f48e8c9b69049eaa60697f47bb6288
https://github.com/Dolibarr/dolibarr/commit/657a78ebe9f48e8c9b69049eaa60697f47bb6288
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/index.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/core/boxes/box_prospect.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/dispatch.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/liste.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/5eb2d3949835...657a78ebe9f4