[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6ac08c: Fix : Product supplier price
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6ac08c: Fix : Product supplier price is related to supplie... |
|
Date: |
Tue, 17 Oct 2017 02:15:11 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6ac08c3bee4ca8cac8a2be589a0fd63dc95e3bb9
https://github.com/Dolibarr/dolibarr/commit/6ac08c3bee4ca8cac8a2be589a0fd63dc95e3bb9
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-05-29 (Mon, 29 May 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix : Product supplier price is related to supplier's currency
Commit: 2f6fe2c65e33c72da9649321964655e48cf26821
https://github.com/Dolibarr/dolibarr/commit/2f6fe2c65e33c72da9649321964655e48cf26821
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-05-30 (Tue, 30 May 2017)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/api/admin/index.php
M htdocs/comm/action/class/api_agendaevents.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_projet.sql
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 0b5adc77952709d1e44376da8395f452f3fe285b
https://github.com/Dolibarr/dolibarr/commit/0b5adc77952709d1e44376da8395f452f3fe285b
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M ChangeLog
M build/debian/source/lintian-overrides
M build/makepack-dolibarr.pl
M htdocs/holiday/card.php
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/main.lang
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 5f6c63948ed7adc99fc7d15a04d253e64f0290fb
https://github.com/Dolibarr/dolibarr/commit/5f6c63948ed7adc99fc7d15a04d253e64f0290fb
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 9b74a632e18bcff7ab8886597334a188233c3333
https://github.com/Dolibarr/dolibarr/commit/9b74a632e18bcff7ab8886597334a188233c3333
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-07 (Wed, 07 Jun 2017)
Changed paths:
M dev/skeletons/build_class_from_table.php
M dev/skeletons/skeleton_card.php
M htdocs/comm/action/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/filefunc.inc.php
M htdocs/projet/card.php
M htdocs/projet/class/api_projects.class.php
M test/phpunit/DateLibTest.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: e19de25297ff39c52899d0564a2d29eee4a71233
https://github.com/Dolibarr/dolibarr/commit/e19de25297ff39c52899d0564a2d29eee4a71233
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-08 (Thu, 08 Jun 2017)
Changed paths:
M dev/skeletons/skeleton_list.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: ec5b304634aa185dc91b3b8630dbcddb69b11ad9
https://github.com/Dolibarr/dolibarr/commit/ec5b304634aa185dc91b3b8630dbcddb69b11ad9
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-09 (Fri, 09 Jun 2017)
Changed paths:
M htdocs/barcode/printsheet.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/images.lib.php
M htdocs/product/class/product.class.php
M htdocs/product/class/service.class.php
M htdocs/product/index.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: c8172d2b49f4d8ca169d98b48524e9652a3082e2
https://github.com/Dolibarr/dolibarr/commit/c8172d2b49f4d8ca169d98b48524e9652a3082e2
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M htdocs/admin/perms.php
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.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/commonobject.class.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/menus/standard/eldy.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/list.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
M htdocs/public/members/new.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/perms.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 166b5da5605ebf50de1ea0a91c1f2a2f9c675a8c
https://github.com/Dolibarr/dolibarr/commit/166b5da5605ebf50de1ea0a91c1f2a2f9c675a8c
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-20 (Tue, 20 Jun 2017)
Changed paths:
M ChangeLog
M htdocs/admin/tools/index.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/list.php
M htdocs/compta/facture.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/ajax/bankconciliate.php
M htdocs/core/ajax/box.php
M htdocs/core/ajax/constantonoff.php
M htdocs/core/ajax/contacts.php
M htdocs/core/ajax/extraparams.php
M htdocs/core/ajax/loadinplace.php
M htdocs/core/ajax/objectonoff.php
M htdocs/core/ajax/price.php
M htdocs/core/ajax/row.php
M htdocs/core/ajax/saveinplace.php
M htdocs/core/ajax/security.php
M htdocs/core/ajax/vatrates.php
M htdocs/core/ajax/ziptown.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/datepicker.php
M htdocs/core/get_menudiv.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/search_page.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/don/card.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/expensereport/ajax/ajaxprojet.php
M htdocs/externalsite/frames.php
M htdocs/fourn/ajax/getSupplierPrices.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/list.php
M htdocs/install/inc.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/product/ajax/products.php
M htdocs/product/stats/card.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/societe/ajax/company.php
M htdocs/societe/ajaxcompanies.php
M htdocs/societe/ajaxcountries.php
M htdocs/supplier_proposal/card.php
M htdocs/support/inc.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/index.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: ea616114a9b3f4c4d0c85b06a4aedf623af9b7e6
https://github.com/Dolibarr/dolibarr/commit/ea616114a9b3f4c4d0c85b06a4aedf623af9b7e6
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-20 (Tue, 20 Jun 2017)
Changed paths:
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/projet/ganttchart.inc.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 8eba4187158cf340d3e6be33298a9bf35d7a62ab
https://github.com/Dolibarr/dolibarr/commit/8eba4187158cf340d3e6be33298a9bf35d7a62ab
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-27 (Tue, 27 Jun 2017)
Changed paths:
M .travis.yml
M ChangeLog
M build/exe/doliwamp/install.forced.php.install
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
M htdocs/admin/tools/export.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture.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/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expedition/class/expedition.class.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/step1.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 98208b9963efea4d7d6d2c1054dcdd9b857130e4
https://github.com/Dolibarr/dolibarr/commit/98208b9963efea4d7d6d2c1054dcdd9b857130e4
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-06-28 (Wed, 28 Jun 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: f8ad108da63a3d4034456c7bb0c8825a9e285633
https://github.com/Dolibarr/dolibarr/commit/f8ad108da63a3d4034456c7bb0c8825a9e285633
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-07 (Fri, 07 Jul 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/commande/class/commande.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/price.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: ba283377b964e317abd519f726f0a8647fbb3c8c
https://github.com/Dolibarr/dolibarr/commit/ba283377b964e317abd519f726f0a8647fbb3c8c
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-09 (Sun, 09 Jul 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/cpaiement.class.php
M htdocs/compta/sociales/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_payment/modules_supplier_payment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/payment/payment.php
M htdocs/fourn/commande/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 794d638ded5c3d0676ffa9dd20827710f0e162f7
https://github.com/Dolibarr/dolibarr/commit/794d638ded5c3d0676ffa9dd20827710f0e162f7
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-11 (Tue, 11 Jul 2017)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 843172ccc8e64f41172b477f82fbba0e110b0213
https://github.com/Dolibarr/dolibarr/commit/843172ccc8e64f41172b477f82fbba0e110b0213
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-17 (Mon, 17 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/compta/bank/bankentries.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: ce534491fd9db37a1390b3ad2e0b28ffd90158c1
https://github.com/Dolibarr/dolibarr/commit/ce534491fd9db37a1390b3ad2e0b28ffd90158c1
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: f876833b9a8eed8bbd1cb2789a91ca83a1df7882
https://github.com/Dolibarr/dolibarr/commit/f876833b9a8eed8bbd1cb2789a91ca83a1df7882
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-18 (Tue, 18 Jul 2017)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Fix : search on rowid don't work with pgsql and natural search
Commit: 4cab48a000fd9141d5b97269c2da85c4d9b38f9d
https://github.com/Dolibarr/dolibarr/commit/4cab48a000fd9141d5b97269c2da85c4d9b38f9d
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-19 (Wed, 19 Jul 2017)
Changed paths:
M .travis.yml
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/class/smtps.class.php
M htdocs/fichinter/list.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_user.sql
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: e1dd85d2615f658fd8c8eee0e62368b362d2af22
https://github.com/Dolibarr/dolibarr/commit/e1dd85d2615f658fd8c8eee0e62368b362d2af22
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-07-27 (Thu, 27 Jul 2017)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/stocks.lang
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: c3152a6343e6ae455bea68a47de39bebd2a355d9
https://github.com/Dolibarr/dolibarr/commit/c3152a6343e6ae455bea68a47de39bebd2a355d9
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M ChangeLog
M build/generate_filelist_xml.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/subscription.php
M htdocs/admin/agenda_other.php
M htdocs/admin/bank.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/commande.php
M htdocs/admin/contract.php
M htdocs/admin/expedition.php
M htdocs/admin/expensereport.php
M htdocs/admin/fichinter.php
M htdocs/admin/livraison.php
M htdocs/admin/payment.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_payment.php
M htdocs/admin/supplier_proposal.php
M htdocs/comm/action/card.php
M htdocs/comm/propal/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/treso.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/admin/donation.php
M htdocs/expedition/card.php
M htdocs/expedition/list.php
M htdocs/filefunc.inc.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/step1.php
M htdocs/product/admin/product.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
M htdocs/projet/admin/project.php
M htdocs/societe/admin/societe.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/card.php
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 49a29a16e644e6d40a2e4bd61a82d7f7b0d605b3
https://github.com/Dolibarr/dolibarr/commit/49a29a16e644e6d40a2e4bd61a82d7f7b0d605b3
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-08-31 (Thu, 31 Aug 2017)
Changed paths:
M htdocs/resource/class/dolresource.class.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 4638ebac8a68860a7e594a9c4a2af7bd7101a890
https://github.com/Dolibarr/dolibarr/commit/4638ebac8a68860a7e594a9c4a2af7bd7101a890
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-09-05 (Tue, 05 Sep 2017)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/compta/bank/index.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 18cbe31a84afdc5facc5c281c2049be50d79a8b1
https://github.com/Dolibarr/dolibarr/commit/18cbe31a84afdc5facc5c281c2049be50d79a8b1
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-09-07 (Thu, 07 Sep 2017)
Changed paths:
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 0608778b9cb8bd11253cd204421319bcb31c4b0d
https://github.com/Dolibarr/dolibarr/commit/0608778b9cb8bd11253cd204421319bcb31c4b0d
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-09-12 (Tue, 12 Sep 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 5383df524623a4b683ecac26c74ebad78019026f
https://github.com/Dolibarr/dolibarr/commit/5383df524623a4b683ecac26c74ebad78019026f
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-09-18 (Mon, 18 Sep 2017)
Changed paths:
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.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/modFournisseur.class.php
M htdocs/core/modules/modProduct.class.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/fourn/card.php
M htdocs/fourn/facture/list.php
M htdocs/includes/tcpdi/tcpdi.php
M htdocs/install/check.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/public/members/new.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 5018bf1baff4daab36ee8ea64df87acbd8d03e8a
https://github.com/Dolibarr/dolibarr/commit/5018bf1baff4daab36ee8ea64df87acbd8d03e8a
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-09-19 (Tue, 19 Sep 2017)
Changed paths:
M htdocs/admin/multicurrency.php
M htdocs/commande/card.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 29a6c7e6ba592c7e33565c75370ec6d32ebc4366
https://github.com/Dolibarr/dolibarr/commit/29a6c7e6ba592c7e33565c75370ec6d32ebc4366
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/fichinter/card.php
M htdocs/holiday/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
Commit: 123c9d2315466292bad0761d3437d95d7ec06276
https://github.com/Dolibarr/dolibarr/commit/123c9d2315466292bad0761d3437d95d7ec06276
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-10-03 (Tue, 03 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Better fix only if bdd is pgsql
Commit: 37b1b161f98fc9132f05e1a74641ca352bfe5cfb
https://github.com/Dolibarr/dolibarr/commit/37b1b161f98fc9132f05e1a74641ca352bfe5cfb
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-10-03 (Tue, 03 Oct 2017)
Changed paths:
M .travis.yml
M ChangeLog
M build/exe/doliwamp/doliwamp.iss
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/subscription.php
M htdocs/admin/agenda_other.php
M htdocs/admin/bank.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/commande.php
M htdocs/admin/contract.php
M htdocs/admin/expedition.php
M htdocs/admin/expensereport.php
M htdocs/admin/fichinter.php
M htdocs/admin/livraison.php
M htdocs/admin/multicurrency.php
M htdocs/admin/payment.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_payment.php
M htdocs/admin/supplier_proposal.php
M htdocs/comm/action/card.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.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/modFournisseur.class.php
M htdocs/core/modules/modProduct.class.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/cron/class/cronjob.class.php
M htdocs/don/admin/donation.php
M htdocs/expedition/card.php
M htdocs/expedition/list.php
M htdocs/fichinter/card.php
M htdocs/fichinter/list.php
M htdocs/filefunc.inc.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/includes/tcpdi/tcpdi.php
M htdocs/install/check.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/install/step1.php
M htdocs/langs/en_US/stocks.lang
M htdocs/product/admin/product.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
M htdocs/projet/admin/project.php
M htdocs/public/members/new.php
M htdocs/resource/class/dolresource.class.php
M htdocs/societe/admin/societe.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M scripts/cron/cron_run_jobs.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge branch '5.0' of github.com:atm-maxime/dolibarr into
fix_member_search_pgsql
Commit: 56acb2c08cff743396009702877c8454b1d462f0
https://github.com/Dolibarr/dolibarr/commit/56acb2c08cff743396009702877c8454b1d462f0
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-05 (Thu, 05 Oct 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix: with 5.0 and 6.0, supplier prices are always in main currency. The
currency is not yet available in supplier prices.
Field to define the currency of supplier prices were added in database but not
yet used by screen/code.
Commit: 346c17b64955806567ce7fccd3ec1fc1b03bc825
https://github.com/Dolibarr/dolibarr/commit/346c17b64955806567ce7fccd3ec1fc1b03bc825
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-05 (Thu, 05 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #7176 from atm-maxime/fix_member_search_pgsql
Fix : search on rowid don't work with pgsql and natural search
Commit: b213c7ed24f357195929a1d69d5d9ba22971384c
https://github.com/Dolibarr/dolibarr/commit/b213c7ed24f357195929a1d69d5d9ba22971384c
Author: John <address@hidden>
Date: 2017-10-10 (Tue, 10 Oct 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix extrafields transmition from supplier order to supplier invoice
Commit: fd796723f22ba06fe9845326874bc69f307479ef
https://github.com/Dolibarr/dolibarr/commit/fd796723f22ba06fe9845326874bc69f307479ef
Author: arnaud <address@hidden>
Date: 2017-10-10 (Tue, 10 Oct 2017)
Changed paths:
M htdocs/compta/bank/bankentries.php
Log Message:
-----------
FIX bankentries search conciliated if val 0
Commit: b4018846e831574b25286c579db47483fecdd674
https://github.com/Dolibarr/dolibarr/commit/b4018846e831574b25286c579db47483fecdd674
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M htdocs/compta/bank/bankentries.php
Log Message:
-----------
Merge pull request #7610 from atm-arnaud/FIX_search_conciliated_bankentries
FIX bankentries search conciliated if val 0
Commit: 1e7676d26fbe2bc89da30985e92c8bdc9fb031b6
https://github.com/Dolibarr/dolibarr/commit/1e7676d26fbe2bc89da30985e92c8bdc9fb031b6
Author: gauthier <address@hidden>
Date: 2017-10-12 (Thu, 12 Oct 2017)
Changed paths:
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
FIX : wrong key in selectarray
Commit: 463441c80866ae4424ba18db9eed709a9d8bfd82
https://github.com/Dolibarr/dolibarr/commit/463441c80866ae4424ba18db9eed709a9d8bfd82
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-12 (Thu, 12 Oct 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix bad table name
Commit: 5ab88e629b84fd12a22ca559ab1cb46099a66e54
https://github.com/Dolibarr/dolibarr/commit/5ab88e629b84fd12a22ca559ab1cb46099a66e54
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-12 (Thu, 12 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 20d4ba9dddc8f3190a65301aeadb04d627d2745a
https://github.com/Dolibarr/dolibarr/commit/20d4ba9dddc8f3190a65301aeadb04d627d2745a
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-13 (Fri, 13 Oct 2017)
Changed paths:
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
Merge pull request #7620 from atm-gauthier/fix_selectthirdparty
FIX : wrong key in selectarray
Commit: b491d22c16c52c87e6f70e1a5c15480e85fbf2bd
https://github.com/Dolibarr/dolibarr/commit/b491d22c16c52c87e6f70e1a5c15480e85fbf2bd
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-14 (Sat, 14 Oct 2017)
Changed paths:
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
FIX selection of thirdparty was lost on stats page of invoices
Commit: bec985a551cc6edcbdfcff6c562df6c0032561b5
https://github.com/Dolibarr/dolibarr/commit/bec985a551cc6edcbdfcff6c562df6c0032561b5
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-16 (Mon, 16 Oct 2017)
Changed paths:
M htdocs/api/class/api_access.class.php
Log Message:
-----------
Fix error message
Commit: a4b4eab2aee1ea4f8c85587c13c0639eecf2cf40
https://github.com/Dolibarr/dolibarr/commit/a4b4eab2aee1ea4f8c85587c13c0639eecf2cf40
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-16 (Mon, 16 Oct 2017)
Changed paths:
M htdocs/api/class/api_access.class.php
Log Message:
-----------
Fix API when using an API key for a user in another entity
Commit: 626fea3f7ac51df6b60a36a2fb2a744163497f37
https://github.com/Dolibarr/dolibarr/commit/626fea3f7ac51df6b60a36a2fb2a744163497f37
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-16 (Mon, 16 Oct 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #7608 from atm-john/fix_supplier_invoice_from_supp_order
Fix extrafields transmition from supplier order to supplier invoice
Commit: 5937fba373ad97af05918f365b88306a33011bc4
https://github.com/Dolibarr/dolibarr/commit/5937fba373ad97af05918f365b88306a33011bc4
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 5998f6076409505c93d6ab12c5406ef77cdf8a17
https://github.com/Dolibarr/dolibarr/commit/5998f6076409505c93d6ab12c5406ef77cdf8a17
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 81e7f4520014fdf7df371f06533d5e90fe631e2f
https://github.com/Dolibarr/dolibarr/commit/81e7f4520014fdf7df371f06533d5e90fe631e2f
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/facture/stats/index.php
Log Message:
-----------
FIX Stats on invoices show nothing
Commit: d70c215ab8fd29a412315097064fcf3fdebf696b
https://github.com/Dolibarr/dolibarr/commit/d70c215ab8fd29a412315097064fcf3fdebf696b
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/api/class/api_access.class.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/facture/stats/index.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/fourn/facture/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/8b140ab069a5...d70c215ab8fd