[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] d480da: Fix #12496 : currency was € in loan schedule
From: |
Laurent Destailleur |
Subject: |
[Dolibarr/dolibarr] d480da: Fix #12496 : currency was € in loan schedule |
Date: |
Sun, 01 Dec 2019 01:51:28 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d480da5629bdd77cbe0244d899c06fbf1fc855d6
https://github.com/Dolibarr/dolibarr/commit/d480da5629bdd77cbe0244d899c06fbf1fc855d6
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-29 (Fri, 29 Nov 2019)
Changed paths:
M htdocs/loan/calcmens.php
M htdocs/loan/schedule.php
Log Message:
-----------
Fix #12496 : currency was € in loan schedule
Commit: 9116110737d152a4ef861aff37fbc396d4d6fbe5
https://github.com/Dolibarr/dolibarr/commit/9116110737d152a4ef861aff37fbc396d4d6fbe5
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/loan/card.php
M htdocs/loan/class/loan.class.php
Log Message:
-----------
Fix #12502 : loan rate wasn't updatable
Commit: 02b5da5db1c2b57c6d88bd18f247527843d6b8fd
https://github.com/Dolibarr/dolibarr/commit/02b5da5db1c2b57c6d88bd18f247527843d6b8fd
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/class/notify.class.php
Log Message:
-----------
Fix #12448 : notifications were sent to disabled user or contacts
Commit: f0cc559f4c121443409e123d352fdca8768c3f40
https://github.com/Dolibarr/dolibarr/commit/f0cc559f4c121443409e123d352fdca8768c3f40
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/loan/card.php
M htdocs/loan/class/loan.class.php
Log Message:
-----------
Merge pull request #12562 from atm-maxime/fix_loan_update_rate
Fix #12502 : loan rate wasn't updatable
Commit: 2a3012f12db7aff48eccbab49329ef7d6e55fed3
https://github.com/Dolibarr/dolibarr/commit/2a3012f12db7aff48eccbab49329ef7d6e55fed3
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/ticket/card.php
Log Message:
-----------
Fix #12481 : fix ticket creation from thirdparty, mission $socid var
Commit: 6bff3c7fd96cb0507a16300e67875cfe1e8444f0
https://github.com/Dolibarr/dolibarr/commit/6bff3c7fd96cb0507a16300e67875cfe1e8444f0
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/loan/calcmens.php
M htdocs/loan/schedule.php
Log Message:
-----------
Merge pull request #12561 from atm-maxime/fix_loan_currency
Fix #12496 : currency was € in loan schedule
Commit: 7b828d1f0bab215b70512059eddedfc107c52b90
https://github.com/Dolibarr/dolibarr/commit/7b828d1f0bab215b70512059eddedfc107c52b90
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/class/notify.class.php
Log Message:
-----------
Merge pull request #12563 from atm-maxime/fix_notification_user_diabled
Fix #12448 : notifications were sent to disabled user or contacts
Commit: fe37983b06d61334f7946aaeb84c794217b577cb
https://github.com/Dolibarr/dolibarr/commit/fe37983b06d61334f7946aaeb84c794217b577cb
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/adherents/subscription.php
Log Message:
-----------
Fix inversion of mime type and mime file name
Commit: b6c88d3c24c9c668b03b82d27d91ef2d33ba6f1d
https://github.com/Dolibarr/dolibarr/commit/b6c88d3c24c9c668b03b82d27d91ef2d33ba6f1d
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/product.lib.php
M htdocs/loan/calcmens.php
M htdocs/loan/schedule.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0
Commit: 9095482113a40e10a6e39edf26cfc7047e52b0dd
https://github.com/Dolibarr/dolibarr/commit/9095482113a40e10a6e39edf26cfc7047e52b0dd
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
Log Message:
-----------
Fix margins access + menu display
Commit: 916954b301a1168064489a73d4111225f8ab5499
https://github.com/Dolibarr/dolibarr/commit/916954b301a1168064489a73d4111225f8ab5499
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/company.lib.php
M htdocs/societe/contact.php
Log Message:
-----------
Fix #12371 : access rights on contacts
Commit: 2c165d0a616e40d23dfb4e667795a0895e9efd8b
https://github.com/Dolibarr/dolibarr/commit/2c165d0a616e40d23dfb4e667795a0895e9efd8b
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix deposit date display in PDF
Commit: 558669dd88a725fe6b7b84e571fe5d875bf2deec
https://github.com/Dolibarr/dolibarr/commit/558669dd88a725fe6b7b84e571fe5d875bf2deec
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Fix #6497 : deposit lines were not translated
Commit: 3c639772d9234c2bbe4ef9b5bede70ace4d2abb8
https://github.com/Dolibarr/dolibarr/commit/3c639772d9234c2bbe4ef9b5bede70ace4d2abb8
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/compta/tva/index.php
Log Message:
-----------
Fix #11228 : VAT dates regarding fiscal year
Commit: 7077457d501978d66add7485996997bebf777200
https://github.com/Dolibarr/dolibarr/commit/7077457d501978d66add7485996997bebf777200
Author: Inovea Conseil <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
A .stickler.yml
M ChangeLog
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
M htdocs/accountancy/index.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/dict.php
M htdocs/admin/multicurrency.php
M htdocs/categories/index.php
M htdocs/comm/action/card.php
M htdocs/comm/action/index.php
M htdocs/comm/action/list.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/remx.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/document.php
M htdocs/compta/stats/byratecountry.php
M htdocs/compta/tva/document.php
M htdocs/contact/card.php
M htdocs/contrat/list.php
M htdocs/contrat/services_list.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/extrafieldsinexport.inc.php
M htdocs/core/js/timesheet.js
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modReceiptPrinter.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/tpl/extrafields_list_search_sql.tpl.php
M htdocs/core/tpl/massactions_pre.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/shipment.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/list.php
M htdocs/hrm/admin/admin_establishment.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/repair.php
M htdocs/install/step2.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/sendings.lang
M htdocs/langs/fr_FR/stocks.lang
M htdocs/livraison/card.php
M htdocs/loan/document.php
M htdocs/main.inc.php
M htdocs/margin/lib/margins.lib.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/index.php
M htdocs/projet/list.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/resource/list.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/notify/index.php
M htdocs/user/card.php
M htdocs/website/class/website.class.php
Log Message:
-----------
Merge remote-tracking branch 'Dolibarr/8.0' into 8.0
Commit: f2ff443641b4d45fde0d0baf0d2de82cbacfaecd
https://github.com/Dolibarr/dolibarr/commit/f2ff443641b4d45fde0d0baf0d2de82cbacfaecd
Author: Nicolas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX #12482
Commit: 639e25814003f40739beeb042a11326b2031b960
https://github.com/Dolibarr/dolibarr/commit/639e25814003f40739beeb042a11326b2031b960
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #12577 from inoveaconseil/#12482
FIX#12482
Commit: a352fd5a6e92e75eb60920d3ef320965f8d1eca2
https://github.com/Dolibarr/dolibarr/commit/a352fd5a6e92e75eb60920d3ef320965f8d1eca2
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Revert "FIX#12482"
Commit: edb8bcb5987422245329f36e9d5b36b670316c94
https://github.com/Dolibarr/dolibarr/commit/edb8bcb5987422245329f36e9d5b36b670316c94
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
Commit: 20e941c5850e0958d7ee42eda2968bcedd4bfc56
https://github.com/Dolibarr/dolibarr/commit/20e941c5850e0958d7ee42eda2968bcedd4bfc56
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge pull request #12579 from atm-maxime/fix_pdf_rouget
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
Commit: 47b35e901101fa7513d2ded97c0f9029f2f7b705
https://github.com/Dolibarr/dolibarr/commit/47b35e901101fa7513d2ded97c0f9029f2f7b705
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/core/lib/company.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/societe/contact.php
Log Message:
-----------
Merge pull request #12570 from atm-maxime/fix_margin_rights
Fix margin rights
Commit: ec67fa487754089955433850b5a91b38d55fcb4c
https://github.com/Dolibarr/dolibarr/commit/ec67fa487754089955433850b5a91b38d55fcb4c
Author: Laurent Destailleur <address@hidden>
Date: 2019-11-30 (Sat, 30 Nov 2019)
Changed paths:
M htdocs/compta/tva/index.php
Log Message:
-----------
Merge pull request #12573 from atm-maxime/fix_vat_fiscal
Fix #11228 : VAT dates regarding fiscal year
Commit: 199b0c11afa6cdca559ce779ced0d41919cf0b8f
https://github.com/Dolibarr/dolibarr/commit/199b0c11afa6cdca559ce779ced0d41919cf0b8f
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Merge pull request #12572 from atm-maxime/fix_deposit
Fix deposit line was not translated in deposit invoice
Commit: 0e19b94719512752ab0246085f82f7cfff83e457
https://github.com/Dolibarr/dolibarr/commit/0e19b94719512752ab0246085f82f7cfff83e457
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/ticket/card.php
Log Message:
-----------
Merge pull request #12565 from atm-maxime/fix_ticket_from_third
FIX #12481 : fix ticket creation from thirdparty, mission $socid var
Commit: bfb8a4e8dac38d13f254229f6b45ff1408679e97
https://github.com/Dolibarr/dolibarr/commit/bfb8a4e8dac38d13f254229f6b45ff1408679e97
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #12578 from Dolibarr/revert-12577-#12482
Revert "FIX#12482"
Commit: 1d564c2a39944bca625358520f9dd4fbc3b3dafb
https://github.com/Dolibarr/dolibarr/commit/1d564c2a39944bca625358520f9dd4fbc3b3dafb
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/tva/index.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/societe/contact.php
Log Message:
-----------
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
Commit: 6bf3af5d83451f203183f7c340310cad7e0fc67a
https://github.com/Dolibarr/dolibarr/commit/6bf3af5d83451f203183f7c340310cad7e0fc67a
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/tva/index.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/loan/card.php
M htdocs/loan/class/loan.class.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/societe/contact.php
Log Message:
-----------
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
Commit: 971add1c2f138ef1d11dbdb7e5eef88951bd3491
https://github.com/Dolibarr/dolibarr/commit/971add1c2f138ef1d11dbdb7e5eef88951bd3491
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/ticket/card.php
Log Message:
-----------
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0
Commit: bf99e8af5d2561f6f6fb0318c35c7daac2aa5f3b
https://github.com/Dolibarr/dolibarr/commit/bf99e8af5d2561f6f6fb0318c35c7daac2aa5f3b
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix phpcs
Commit: 00e901ade8ffa4ed5ed5afdce776126026da4561
https://github.com/Dolibarr/dolibarr/commit/00e901ade8ffa4ed5ed5afdce776126026da4561
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
Log Message:
-----------
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/core/lib/pdf.lib.php
Commit: 790fdc881c394669fa0133b03b07dafbd4eeee38
https://github.com/Dolibarr/dolibarr/commit/790fdc881c394669fa0133b03b07dafbd4eeee38
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/adherents/subscription.php
M htdocs/compta/facture/card.php
M htdocs/compta/tva/index.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/loan/calcmens.php
M htdocs/loan/card.php
M htdocs/loan/class/loan.class.php
M htdocs/loan/schedule.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/societe/contact.php
M htdocs/ticket/card.php
Log Message:
-----------
# WARNING: head commit changed in the meantime
Restore file for travis
Commit: 6388370edc4087bcedcb856901b75e70fafb48e4
https://github.com/Dolibarr/dolibarr/commit/6388370edc4087bcedcb856901b75e70fafb48e4
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-01 (Sun, 01 Dec 2019)
Changed paths:
M htdocs/bom/tpl/objectline_create.tpl.php
M htdocs/categories/viewcat.php
M htdocs/margin/productMargins.php
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/time.php
M htdocs/societe/admin/societe.php
M htdocs/societe/price.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/df5ef99f4ff7...6388370edc40
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr/dolibarr] d480da: Fix #12496 : currency was € in loan schedule,
Laurent Destailleur <=