[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 093e36: Merge branch '3.8' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 093e36: Merge branch '3.8' of address@hidden:Dolibarr/doli... |
|
Date: |
Wed, 18 May 2016 11:48:11 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 093e3666ae33cc5d0964a69c9116cf7e5866ec99
https://github.com/Dolibarr/dolibarr/commit/093e3666ae33cc5d0964a69c9116cf7e5866ec99
Author: Florian HENRY <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/core/boxes/box_task.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 4401d2ee9cce2620747ba52ebd4c23438f0f854e
https://github.com/Dolibarr/dolibarr/commit/4401d2ee9cce2620747ba52ebd4c23438f0f854e
Author: Florian HENRY <address@hidden>
Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths:
M htdocs/compta/bank/search.php
M htdocs/compta/index.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/paiement.php
M htdocs/includes/nusoap/lib/nusoap.php
M htdocs/margin/lib/margins.lib.php
M htdocs/product/composition/card.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 94d92d3cbbc50e9b3fd584398931a9bbf5c02ccf
https://github.com/Dolibarr/dolibarr/commit/94d92d3cbbc50e9b3fd584398931a9bbf5c02ccf
Author: Florian HENRY <address@hidden>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture.class.php
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: bfbb1c20bcc92a383fb64e04a1248e33937e1e9c
https://github.com/Dolibarr/dolibarr/commit/bfbb1c20bcc92a383fb64e04a1248e33937e1e9c
Author: Florian HENRY <address@hidden>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX bug on email template
Commit: b280a700d267f5cd481f39002bafd18a023c8704
https://github.com/Dolibarr/dolibarr/commit/b280a700d267f5cd481f39002bafd18a023c8704
Author: Florian HENRY <address@hidden>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
FIX missing column when module was installed before standard integration
Commit: 1c0bdfcf1e767acc0481f0c0783b9de60c2566aa
https://github.com/Dolibarr/dolibarr/commit/1c0bdfcf1e767acc0481f0c0783b9de60c2566aa
Author: Florian HENRY <address@hidden>
Date: 2016-05-10 (Tue, 10 May 2016)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/accountancy/admin/index.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/core/class/html.form.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: d3b3e60d82edc38345473f0c4b478ae1c70310d1
https://github.com/Dolibarr/dolibarr/commit/d3b3e60d82edc38345473f0c4b478ae1c70310d1
Author: Florian HENRY <address@hidden>
Date: 2016-05-10 (Tue, 10 May 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Fix email template edition
Commit: 4cbab1cf47a4d3fcb99acaf7e6f7cad74bdaa0f7
https://github.com/Dolibarr/dolibarr/commit/4cbab1cf47a4d3fcb99acaf7e6f7cad74bdaa0f7
Author: Florian HENRY <address@hidden>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M htdocs/product/document.php
Log Message:
-----------
FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH
Commit: 21b639ef168389b2d2a6b92482179b577621f76a
https://github.com/Dolibarr/dolibarr/commit/21b639ef168389b2d2a6b92482179b577621f76a
Author: Juanjo Menent <address@hidden>
Date: 2016-05-14 (Sat, 14 May 2016)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix issues with entity control
Commit: b3b064d310312b53133ac4cf234d9b7efc3fa916
https://github.com/Dolibarr/dolibarr/commit/b3b064d310312b53133ac4cf234d9b7efc3fa916
Author: Alexis Algoud <address@hidden>
Date: 2016-05-14 (Sat, 14 May 2016)
Changed paths:
M htdocs/user/group/card.php
Log Message:
-----------
FIX hook on group card called but not initialized
Commit: af8608ab7aa2fe8fc188e53cde6290ce35b7dadf
https://github.com/Dolibarr/dolibarr/commit/af8608ab7aa2fe8fc188e53cde6290ce35b7dadf
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-05-16 (Mon, 16 May 2016)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
Commit: f7c9f20b16297c41c002a3cb1e915a98a4f83c9b
https://github.com/Dolibarr/dolibarr/commit/f7c9f20b16297c41c002a3cb1e915a98a4f83c9b
Author: Your Name <address@hidden>
Date: 2016-05-16 (Mon, 16 May 2016)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Fix: Expensereport not compatible with multicompany.
Commit: 7bbb3a7da10e024d78ad4911bf6f7a730f720ebe
https://github.com/Dolibarr/dolibarr/commit/7bbb3a7da10e024d78ad4911bf6f7a730f720ebe
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-17 (Tue, 17 May 2016)
Changed paths:
M htdocs/langs/en_US/other.lang
M htdocs/product/class/product.class.php
M htdocs/product/stats/card.php
Log Message:
-----------
Supplier proposal was missing
Commit: a4b497ef819d13d69440d098bf20b39448a66ea8
https://github.com/Dolibarr/dolibarr/commit/a4b497ef819d13d69440d098bf20b39448a66ea8
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/user/group/card.php
Log Message:
-----------
Merge pull request #5212 from
atm-alexis/3.8_fix_hook_called_but_not_initialized
FIX 3.8 hook on group card called but not initialized
Commit: 43cb646779aa7f11b8104962aa720fc050c94b8b
https://github.com/Dolibarr/dolibarr/commit/43cb646779aa7f11b8104962aa720fc050c94b8b
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Merge pull request #5219 from fmarcet/3.8
Fix: Expensereport not compatible with multicompany
Commit: c7dda59fbc150eb7c96a7dc7c0e8846af4de5e6f
https://github.com/Dolibarr/dolibarr/commit/c7dda59fbc150eb7c96a7dc7c0e8846af4de5e6f
Author: Regis Houssin <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix: doublon (merge problem?)
Commit: 517b189df2e0d82ce2873d401d72840da334f457
https://github.com/Dolibarr/dolibarr/commit/517b189df2e0d82ce2873d401d72840da334f457
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Merge pull request #5225 from hregis/3.8_bug
Fix: doublon (merge problem?)
Commit: 24673d066fdfd67d87b2bf6185dd2660cac2dd42
https://github.com/Dolibarr/dolibarr/commit/24673d066fdfd67d87b2bf6185dd2660cac2dd42
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
Merge pull request #5216 from
atm-maxime/fix_dispatch_services_on_supplier_order
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
Commit: 85cc5cbf023f9d239f60f3f18d9519346cd75f8a
https://github.com/Dolibarr/dolibarr/commit/85cc5cbf023f9d239f60f3f18d9519346cd75f8a
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Merge pull request #5210 from simnandez/3.9
FIX issues with entity in leave creation
Commit: 12a5fbbea70e89e8ff26f6486ba5ac5ec405d0a1
https://github.com/Dolibarr/dolibarr/commit/12a5fbbea70e89e8ff26f6486ba5ac5ec405d0a1
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/product/document.php
Log Message:
-----------
Merge pull request #5191 from FHenry/3.8
Fix email template edition
Commit: 49c2549400c49a772efab32a7f6feb48d5021427
https://github.com/Dolibarr/dolibarr/commit/49c2549400c49a772efab32a7f6feb48d5021427
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/product/document.php
M htdocs/user/group/card.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/comm/propal.php
Commit: e7072185abc933ecce9014ee5579a3092de9e38b
https://github.com/Dolibarr/dolibarr/commit/e7072185abc933ecce9014ee5579a3092de9e38b
Author: Laurent Destailleur <address@hidden>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/holiday/class/holiday.class.php
M htdocs/product/document.php
M htdocs/user/group/card.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/comm/propal.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7cca4f3e8ace...e7072185abc9