[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 92b791: Fix : button convert was stil
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 92b791: Fix : button convert was still available even if d... |
Date: |
Mon, 12 Jun 2017 09:23:24 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 92b7914ef39a40d5dc9845ca4fd9694ab54f57e7
https://github.com/Dolibarr/dolibarr/commit/92b7914ef39a40d5dc9845ca4fd9694ab54f57e7
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-09 (Fri, 09 Jun 2017)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix : button convert was still available even if deposit was already converted
Commit: 9341d5f448476a9a52d3b4cdf914706c882c8fcc
https://github.com/Dolibarr/dolibarr/commit/9341d5f448476a9a52d3b4cdf914706c882c8fcc
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-09 (Fri, 09 Jun 2017)
Changed paths:
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/main.inc.php
Log Message:
-----------
FIX Line of invoices not inserted when using POS module and VAT NPR.
Commit: 4b4b2ad1b74391521fa3fa82afc8acbd1dd42d0b
https://github.com/Dolibarr/dolibarr/commit/4b4b2ad1b74391521fa3fa82afc8acbd1dd42d0b
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-10 (Sat, 10 Jun 2017)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #6965 from atm-maxime/fix_converttoreduc
Fix : button convert was still available even if deposit was already …
Commit: 0d24df9ffcd0762bc732da77bd80badf81f8af80
https://github.com/Dolibarr/dolibarr/commit/0d24df9ffcd0762bc732da77bd80badf81f8af80
Author: atm-ph <address@hidden>
Date: 2017-06-10 (Sat, 10 Jun 2017)
Changed paths:
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Fix 6939 new path for pictures is not used
Commit: 0eab5768f7667802d35a86ea890f1bc4d22df655
https://github.com/Dolibarr/dolibarr/commit/0eab5768f7667802d35a86ea890f1bc4d22df655
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-11 (Sun, 11 Jun 2017)
Changed paths:
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge pull request #6971 from atm-ph/fix_6939
FIX #6939 new path for pictures is not used
Commit: 946e72f269a3ec7aede35fedf42a0c38ecf713fd
https://github.com/Dolibarr/dolibarr/commit/946e72f269a3ec7aede35fedf42a0c38ecf713fd
Author: atm-ph <address@hidden>
Date: 2017-06-11 (Sun, 11 Jun 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix 6982 missing parameter to get more informations about files
Commit: e99d57802bebe6aee34ab436e998617626dfc9b4
https://github.com/Dolibarr/dolibarr/commit/e99d57802bebe6aee34ab436e998617626dfc9b4
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-11 (Sun, 11 Jun 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Merge pull request #6986 from atm-ph/fix_6982
Fix 6982 missing parameter to get more informations about files
Commit: 51579817517c8ef8159702f81cea9a6aa883bb9b
https://github.com/Dolibarr/dolibarr/commit/51579817517c8ef8159702f81cea9a6aa883bb9b
Author: atm-ph <address@hidden>
Date: 2017-06-11 (Sun, 11 Jun 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Fix 6962 wrong permission check
Commit: 6d130351a0c82612f69b93fa7d8cbee4e24f0193
https://github.com/Dolibarr/dolibarr/commit/6d130351a0c82612f69b93fa7d8cbee4e24f0193
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix css
Commit: 0207f86aa5cc5e069bfdc04b5d039b246cca3bdc
https://github.com/Dolibarr/dolibarr/commit/0207f86aa5cc5e069bfdc04b5d039b246cca3bdc
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/compta/facture.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 8f7371cdf0f6b7e8a286a783673f847daeac6706
https://github.com/Dolibarr/dolibarr/commit/8f7371cdf0f6b7e8a286a783673f847daeac6706
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/product/index.php
Log Message:
-----------
Product has 2 status. Add span to differentiate for css
Commit: cd0869064650d17d514a7b78c8ee11061d475de4
https://github.com/Dolibarr/dolibarr/commit/cd0869064650d17d514a7b78c8ee11061d475de4
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
Fix ajax search product that return bad json response
Commit: ec24f223b5f137c30ea1f1672f64c60ce75bf9a2
https://github.com/Dolibarr/dolibarr/commit/ec24f223b5f137c30ea1f1672f64c60ce75bf9a2
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/boxes/box_produits_alerte_stock.php
Log Message:
-----------
Fix permission on widget
Commit: bf41056c68d879aac5f6196f7ca85e9099d7c274
https://github.com/Dolibarr/dolibarr/commit/bf41056c68d879aac5f6196f7ca85e9099d7c274
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_external_rss.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_goodcustomers.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_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/boxes/box_task.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/infobox.class.php
Log Message:
-----------
Fix test on permission for widgets
Commit: d7cbb598c12283d1d937a17089349510258eff4f
https://github.com/Dolibarr/dolibarr/commit/d7cbb598c12283d1d937a17089349510258eff4f
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_prospect.php
Log Message:
-----------
Fix permission for external users
Commit: 279e6ab30468429e5a46964000e76680c42fae16
https://github.com/Dolibarr/dolibarr/commit/279e6ab30468429e5a46964000e76680c42fae16
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
Log Message:
-----------
Fix missing parameters
Commit: 2916444f6c7919cc80b8c316ac881994e25d8dc8
https://github.com/Dolibarr/dolibarr/commit/2916444f6c7919cc80b8c316ac881994e25d8dc8
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix check on module product for external user
Commit: 5d9a84dedb4bea9283c30b257b4add9385ab383d
https://github.com/Dolibarr/dolibarr/commit/5d9a84dedb4bea9283c30b257b4add9385ab383d
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Fix sql syntax error
Commit: 64a6ff9687d8fec5462117066fd335f62591e849
https://github.com/Dolibarr/dolibarr/commit/64a6ff9687d8fec5462117066fd335f62591e849
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/note.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/card.php
M htdocs/product/stock/info.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/productlot_card.php
M htdocs/product/traduction.php
Log Message:
-----------
Fix test for navigation disabling for external users
Commit: 71afaaa3608e421004718fbf9d0071888e5ce259
https://github.com/Dolibarr/dolibarr/commit/71afaaa3608e421004718fbf9d0071888e5ce259
Author: florian HENRY <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
fix : availibity refresh
Commit: dbccef8ef5386f00f9fe0565bd27332284fd9f6a
https://github.com/Dolibarr/dolibarr/commit/dbccef8ef5386f00f9fe0565bd27332284fd9f6a
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #6990 from atm-florian/5.0_fix_availability
fix : availibity refresh
Commit: 4402c7fb8945828c679a0b4db2f1bfd8be6c1416
https://github.com/Dolibarr/dolibarr/commit/4402c7fb8945828c679a0b4db2f1bfd8be6c1416
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #6987 from atm-ph/fix_6962
FIX 6962 Can't create shipment if no write permission on order
Commit: ba3a74576cd9d9fe64e13664183546ba21006535
https://github.com/Dolibarr/dolibarr/commit/ba3a74576cd9d9fe64e13664183546ba21006535
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_external_rss.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_goodcustomers.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_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/boxes/box_task.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/infobox.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/expedition/card.php
M htdocs/main.inc.php
M htdocs/product/ajax/products.php
M htdocs/product/card.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/index.php
M htdocs/product/info.php
M htdocs/product/note.php
M htdocs/product/price.php
M htdocs/product/stats/card.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/card.php
M htdocs/product/stock/info.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/productlot_card.php
M htdocs/product/traduction.php
Log Message:
-----------
Merge 5.0
Commit: 3f064769ac64100f40054d3dad920608224a40a3
https://github.com/Dolibarr/dolibarr/commit/3f064769ac64100f40054d3dad920608224a40a3
Author: Laurent Destailleur <address@hidden>
Date: 2017-06-12 (Mon, 12 Jun 2017)
Changed paths:
M htdocs/blockedlog/admin/blockedlog.php
M htdocs/blockedlog/admin/fingerprints.php
A htdocs/blockedlog/ajax/block-info.php
M htdocs/blockedlog/class/authority.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_blockedlog.sql
A htdocs/langs/en_US/blockedlog.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/ecf29332f3dc...3f064769ac64