[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d3b32c: Fixed: Bad function/picto for
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d3b32c: Fixed: Bad function/picto for information messages... |
|
Date: |
Sun, 30 Nov 2014 05:16:23 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d3b32ce22f630bffe0bbbdd9b98c392ac577b622
https://github.com/Dolibarr/dolibarr/commit/d3b32ce22f630bffe0bbbdd9b98c392ac577b622
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/admin/modules.php
M htdocs/admin/perms.php
M htdocs/admin/stock.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
M htdocs/user/perms.php
Log Message:
-----------
Fixed: Bad function/picto for information messages (not a star)
Commit: 7f0a01936edc502b82370825a054de184714c41b
https://github.com/Dolibarr/dolibarr/commit/7f0a01936edc502b82370825a054de184714c41b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/langs/en_US/admin.lang
M htdocs/product/stock/card.php
Log Message:
-----------
Fix a very old bug of conflicth into decrease stock when using point of
sale, not compatible with option defined into stock module.
Commit: cdd256e20618e80dd692522bbef59accb466d595
https://github.com/Dolibarr/dolibarr/commit/cdd256e20618e80dd692522bbef59accb466d595
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Add info to help understand debug
Commit: e118d9af2233feabc460b0223fd3feab82bc64e5
https://github.com/Dolibarr/dolibarr/commit/e118d9af2233feabc460b0223fd3feab82bc64e5
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/core/class/html.formadmin.class.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Fixed: Protection to lock language setup in demo mode was not working
Commit: c7420662e6d13e089639ee9807af687bd21cda84
https://github.com/Dolibarr/dolibarr/commit/c7420662e6d13e089639ee9807af687bd21cda84
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Fixed: Module for target emailing must not be visible when modules is
disabled.
Commit: 278cdf72d6bf0bb12eab334beb48f5d98d54e721
https://github.com/Dolibarr/dolibarr/commit/278cdf72d6bf0bb12eab334beb48f5d98d54e721
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/admin/propal.php
M htdocs/comm/propal.php
M htdocs/comm/propal/apercu.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/index.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.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/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.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/core/tpl/objectline_create.tpl.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/holiday/define_holiday.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/main.inc.php
M htdocs/projet/card.php
M htdocs/societe/soc.php
M htdocs/webservices/server_order.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 3fe2db6c8dfc012af796f467635f817f5ee54a6d
https://github.com/Dolibarr/dolibarr/commit/3fe2db6c8dfc012af796f467635f817f5ee54a6d
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Try to find a solution to fight against spam sending from dolibarr when
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
Commit: 1797569a6d97002f92118b4474fe235f6aa26ab0
https://github.com/Dolibarr/dolibarr/commit/1797569a6d97002f92118b4474fe235f6aa26ab0
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/core/class/html.formadmin.class.php
M htdocs/langs/en_US/mails.lang
M htdocs/main.inc.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: b9ea7d4d13c5e4995e3118b830c2dd26c78e5de4
https://github.com/Dolibarr/dolibarr/commit/b9ea7d4d13c5e4995e3118b830c2dd26c78e5de4
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/include/environnement.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/validation_verif.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/langs/en_US/agenda.lang
Log Message:
-----------
Fix: Stock decrease from POS
Commit: 730398361031db6cf563ff26ba7db84588458c30
https://github.com/Dolibarr/dolibarr/commit/730398361031db6cf563ff26ba7db84588458c30
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M htdocs/admin/stock.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/langs/en_US/admin.lang
M htdocs/product/stock/product.php
Log Message:
-----------
Fixed: Ton of old bugs when debugging POS.
Commit: da841e28cdf14c5065dcff099f783e0dc3450f82
https://github.com/Dolibarr/dolibarr/commit/da841e28cdf14c5065dcff099f783e0dc3450f82
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Add warning
Commit: 20e76aa4e66e1f47371a003ed591f9170b4a37f4
https://github.com/Dolibarr/dolibarr/commit/20e76aa4e66e1f47371a003ed591f9170b4a37f4
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fixed: Use constant to hide a feature that will probably be broken. Also
it is a superfluous feature.
Commit: e2c606f4161da9584010792489b4d9c3d7d8422a
https://github.com/Dolibarr/dolibarr/commit/e2c606f4161da9584010792489b4d9c3d7d8422a
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Better translation
Commit: 01209ff844da574a2ddaa150238ea9c21623bae0
https://github.com/Dolibarr/dolibarr/commit/01209ff844da574a2ddaa150238ea9c21623bae0
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M ChangeLog
M htdocs/admin/modules.php
M htdocs/admin/perms.php
M htdocs/admin/stock.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/include/environnement.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formadmin.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/mails.lang
M htdocs/main.inc.php
M htdocs/product/stock/card.php
M htdocs/product/stock/product.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/product/stock/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/06df952e577e...01209ff844da