[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 06:23:27 -0700 |
Branch: refs/heads/develop
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: 1d85529eda86b03f206ea627ca917551041a6c18
https://github.com/Dolibarr/dolibarr/commit/1d85529eda86b03f206ea627ca917551041a6c18
Author: Francis Appels <address@hidden>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Fix delete not used empty stock record
When removing all stock from warehouse are move all stock to other
warehouse, there is still an 0 stock record in in the stock table for
the source warehouse, not visible in Dolibarr.
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: b268ccf064b453974ea197a013e3b46f7ee2b809
https://github.com/Dolibarr/dolibarr/commit/b268ccf064b453974ea197a013e3b46f7ee2b809
Author: aspangaro <address@hidden>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
Log Message:
-----------
Fix #3455 In advanced accounting module, button transfer to general ledger
don't work
Commit: a4a72d64c033a775d031628c500d503d0f436fe5
https://github.com/Dolibarr/dolibarr/commit/a4a72d64c033a775d031628c500d503d0f436fe5
Author: aspangaro <address@hidden>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
New: Accountancy Add message when general ledger is witten
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: e5ad14442a41dba12ed383199788b50e2c3fd6e8
https://github.com/Dolibarr/dolibarr/commit/e5ad14442a41dba12ed383199788b50e2c3fd6e8
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #3472 from aspangaro/3.7-5
Fix #3455 In advanced accounting module, button transfer to general ledger
don't work
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: 89b723b2a778e1ba4c8d910840fda2e304c92e7f
https://github.com/Dolibarr/dolibarr/commit/89b723b2a778e1ba4c8d910840fda2e304c92e7f
Author: Florian HENRY <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M htdocs/core/modules/modStock.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
FIX : multientity warehouse management
Commit: 10aacb88111fce9ba58bf8aae98e08daa4c7978e
https://github.com/Dolibarr/dolibarr/commit/10aacb88111fce9ba58bf8aae98e08daa4c7978e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M dev/skeletons/build_class_from_table.php
M dev/skeletons/skeleton_page.php
Log Message:
-----------
Fix code generator
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: 1f44bb5947aae8f8d16a269b71099aba3784eb5c
https://github.com/Dolibarr/dolibarr/commit/1f44bb5947aae8f8d16a269b71099aba3784eb5c
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M htdocs/core/modules/modStock.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge pull request #3495 from FHenry/3.7
FIX : multientity warehouse management
Commit: c13d2d202b142f9aedaf42220c6b1b104edcf3fd
https://github.com/Dolibarr/dolibarr/commit/c13d2d202b142f9aedaf42220c6b1b104edcf3fd
Author: Juanjo Menent <address@hidden>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
Commit: f02bd4e7563d798207cbd7dc5a7e666345b68e1e
https://github.com/Dolibarr/dolibarr/commit/f02bd4e7563d798207cbd7dc5a7e666345b68e1e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 7fd01d4aa3ddd44f20937049c5c0a8550f9b929e
https://github.com/Dolibarr/dolibarr/commit/7fd01d4aa3ddd44f20937049c5c0a8550f9b929e
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M ChangeLog
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/product/stock/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
Commit: d3f1a7d5b8113b525e2c3e69462c88bfb0de0785
https://github.com/Dolibarr/dolibarr/commit/d3f1a7d5b8113b525e2c3e69462c88bfb0de0785
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
FIX Bad condition into invoice export request making reporting too many
rows.
Commit: 8c1760fbcf8495a49fab50d9a755d78350efe954
https://github.com/Dolibarr/dolibarr/commit/8c1760fbcf8495a49fab50d9a755d78350efe954
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-09 (Wed, 09 Sep 2015)
Changed paths:
M ChangeLog
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/card.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/index.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/valo.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
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: eb4c46ca3dd87f72934796feb800f1e1a7884f74
https://github.com/Dolibarr/dolibarr/commit/eb4c46ca3dd87f72934796feb800f1e1a7884f74
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M dev/skeletons/skeleton_page.php
Log Message:
-----------
Fix code generator
Commit: 7951483c5f8e5a06a3c7318531585eda52d381bb
https://github.com/Dolibarr/dolibarr/commit/7951483c5f8e5a06a3c7318531585eda52d381bb
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M htdocs/core/modules/modSociete.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/imports/class/import.class.php
Log Message:
-----------
Fix: examples ko for import
Fix bad picto for export
Commit: a294700cef7e253e63723e83f68199e9c88571c7
https://github.com/Dolibarr/dolibarr/commit/a294700cef7e253e63723e83f68199e9c88571c7
Author: fappels <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
fix dispatch rounding version 1
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: 75a14e02d8e1429c5545d8785fa80792f568b153
https://github.com/Dolibarr/dolibarr/commit/75a14e02d8e1429c5545d8785fa80792f568b153
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.7 Rounding issue when dispatching non-integer
Commit: c290840513b9cc6bf3ab50e5beace5e3a5aaedb0
https://github.com/Dolibarr/dolibarr/commit/c290840513b9cc6bf3ab50e5beace5e3a5aaedb0
Author: fappels <address@hidden>
Date: 2015-09-10 (Thu, 10 Sep 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Revert "Fix delete not used empty stock record"
This reverts commit 1d85529eda86b03f206ea627ca917551041a6c18.
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: a83b3ae7e8052a127e98936617f4e7573a3fa8ac
https://github.com/Dolibarr/dolibarr/commit/a83b3ae7e8052a127e98936617f4e7573a3fa8ac
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 #3503 from fappels/3.7-dispatch-rounding
Fix #3471 3.7 Rounding issue when dispatching non-integer
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: 309e1604e1d80e2e4d85e9962265c5790d778b65
https://github.com/Dolibarr/dolibarr/commit/309e1604e1d80e2e4d85e9962265c5790d778b65
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modExpenseReport.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/holiday/list.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/install.lang
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Fix migration missing for leave request module
Fix permission label for expense report and leave request
Commit: 0bfccc7255e4dff1ddf7a426290ee1528d482b6a
https://github.com/Dolibarr/dolibarr/commit/0bfccc7255e4dff1ddf7a426290ee1528d482b6a
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/core/class/html.formfile.class.php
M htdocs/langs/en_US/link.lang
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix print into form to attach file must be into return.
Commit: 75eae394f14353faf64cec1f5d71f5ca7e532461
https://github.com/Dolibarr/dolibarr/commit/75eae394f14353faf64cec1f5d71f5ca7e532461
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M scripts/company/sync_contacts_dolibarr2ldap.php
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_ldap2dolibarr.php
Log Message:
-----------
Fix confirmation of scripts make scripts not working with cron
Commit: 36632593c04afd8536c6fa83fc180d0785c81b18
https://github.com/Dolibarr/dolibarr/commit/36632593c04afd8536c6fa83fc180d0785c81b18
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/class/contact.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/product/class/product.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix SQL injections #3300
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: 0c3ebe63c282d157ae5cd1bcea054a18bd0a4510
https://github.com/Dolibarr/dolibarr/commit/0c3ebe63c282d157ae5cd1bcea054a18bd0a4510
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 remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/liste.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
Commit: db1d9d6d8ed899e6dd2e2116bb0582989beb77a5
https://github.com/Dolibarr/dolibarr/commit/db1d9d6d8ed899e6dd2e2116bb0582989beb77a5
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/core/modules/modFacture.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/dispatch.php
Commit: 1966d75cedb0a1ce79a5840c0e44b27fbf414b86
https://github.com/Dolibarr/dolibarr/commit/1966d75cedb0a1ce79a5840c0e44b27fbf414b86
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #3490
Commit: a5c6582bc1ad8b80d400b33a0661ad1980fb234d
https://github.com/Dolibarr/dolibarr/commit/a5c6582bc1ad8b80d400b33a0661ad1980fb234d
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M dev/skeletons/skeleton_page.php
M htdocs/comm/action/card.php
M htdocs/core/lib/functions.lib.php
M htdocs/expensereport/card.php
M htdocs/ftp/index.php
M htdocs/holiday/define_holiday.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/user/card.php
Log Message:
-----------
Fix duplicate translation/encoding on setEventMessage
Conflicts:
htdocs/ftp/index.php
Commit: 97096536b1d179e328d8c311ccf6e9d0766776ec
https://github.com/Dolibarr/dolibarr/commit/97096536b1d179e328d8c311ccf6e9d0766776ec
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modDeplacement.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modTax.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
Log Message:
-----------
Fix #2526 The filter on type numeric is ok now. Sometimes we used
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
Commit: 94723a9b834216fd217ec6623a25090f06b11a9d
https://github.com/Dolibarr/dolibarr/commit/94723a9b834216fd217ec6623a25090f06b11a9d
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-12 (Sat, 12 Sep 2015)
Changed paths:
M ChangeLog
M dev/skeletons/build_class_from_table.php
M dev/skeletons/skeleton_page.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modDeplacement.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modTax.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/card.php
M htdocs/imports/class/import.class.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/c785f8cfb12a...94723a9b8342