[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1331e8: fix filter for TYPE_SITUATION
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1331e8: fix filter for TYPE_SITUATION invoice |
|
Date: |
Wed, 10 Jan 2018 16:03:25 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1331e8add737ae66638fef468fbd31d879db78c9
https://github.com/Dolibarr/dolibarr/commit/1331e8add737ae66638fef468fbd31d879db78c9
Author: John <address@hidden>
Date: 2018-01-02 (Tue, 02 Jan 2018)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
fix filter for TYPE_SITUATION invoice
Commit: 61efda4cbd148b2656df9ddc8023c05fe6badfc3
https://github.com/Dolibarr/dolibarr/commit/61efda4cbd148b2656df9ddc8023c05fe6badfc3
Author: ATM-Nicolas <address@hidden>
Date: 2018-01-02 (Tue, 02 Jan 2018)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX : product best price on product list
Commit: 2e6c036ad8430f4f7161e8721f049fe93e88758b
https://github.com/Dolibarr/dolibarr/commit/2e6c036ad8430f4f7161e8721f049fe93e88758b
Author: ATM-Nicolas <address@hidden>
Date: 2018-01-02 (Tue, 02 Jan 2018)
Changed paths:
M dev/dolibarr_changes.txt
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/tpl/linkedobjectblock.tpl.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/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/multiprix.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/document.php
M htdocs/commande/info.php
M htdocs/commande/note.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
M htdocs/compta/paiement.php
M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/note.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/ajax/saveinplace.php
M htdocs/core/class/html.form.class.php
M htdocs/core/js/editinplace.js
M htdocs/core/lib/ajax.lib.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/originproductline.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/contact.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/info.php
M htdocs/fourn/facture/note.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/index.php
M htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.js
M htdocs/langs/fr_FR/other.lang
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/product/tpl/card_view.tpl.php
M htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/tpl/card_view.tpl.php
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price
Commit: 25390e5f73f5497ced8d451ea1e903255e619f96
https://github.com/Dolibarr/dolibarr/commit/25390e5f73f5497ced8d451ea1e903255e619f96
Author: florian HENRY <address@hidden>
Date: 2018-01-03 (Wed, 03 Jan 2018)
Changed paths:
M htdocs/fourn/commande/orderstoinvoice.php
Log Message:
-----------
fix : linked object (new format of linked_object atribut on 6.0)
Commit: 58470e0913ad38f4462185295f58379b21005b5a
https://github.com/Dolibarr/dolibarr/commit/58470e0913ad38f4462185295f58379b21005b5a
Author: gauthier <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
Commit: e4d37c3e232ec37c94269c18ec4c8adc4bd5f703
https://github.com/Dolibarr/dolibarr/commit/e4d37c3e232ec37c94269c18ec4c8adc4bd5f703
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price
Fix product best price
Commit: a14a3db2e9c39945eba09cab07965cad1110e708
https://github.com/Dolibarr/dolibarr/commit/a14a3db2e9c39945eba09cab07965cad1110e708
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #8013 from atm-john/FIX_invoice_filter_type
fix filter for TYPE_SITUATION invoice
Commit: 550fc37e62a4c2fc3afe659b1e6e455dbdc3b360
https://github.com/Dolibarr/dolibarr/commit/550fc37e62a4c2fc3afe659b1e6e455dbdc3b360
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/fourn/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #8017 from atm-florian/6.0
fix : linked object (new format of linked_object atribut on 6.0)
Commit: 301f509611ff9b48436c63da928672f8e1799cd4
https://github.com/Dolibarr/dolibarr/commit/301f509611ff9b48436c63da928672f8e1799cd4
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
Commit: 7e8fda2d71ef31181c104c9eec81f1001cdb7511
https://github.com/Dolibarr/dolibarr/commit/7e8fda2d71ef31181c104c9eec81f1001cdb7511
Author: sschwebel <address@hidden>
Date: 2018-01-05 (Fri, 05 Jan 2018)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
FIX #8029 Unable to make leave request in holyday module
wrong variable name in card.php
Commit: a1ac285a25c9dda1c5caffe4b4ba45bc84e43eb4
https://github.com/Dolibarr/dolibarr/commit/a1ac285a25c9dda1c5caffe4b4ba45bc84e43eb4
Author: Paul Dermody <address@hidden>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M htdocs/core/lib/product.lib.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Fixed automated computation of surface and volume to use correct units. It
was failing for inches and feet.
Commit: 22d92c05408bb42b0b85f2ebe3c36837b69f9fc2
https://github.com/Dolibarr/dolibarr/commit/22d92c05408bb42b0b85f2ebe3c36837b69f9fc2
Author: atm-ph <address@hidden>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/fourn/class/paiementfourn.class.php
Log Message:
-----------
Fix wrong address used into PDF model of supplier payment
Commit: 0f51aa15d867b5c4a1235966b5e6f767d36f5f35
https://github.com/Dolibarr/dolibarr/commit/0f51aa15d867b5c4a1235966b5e6f767d36f5f35
Author: Regis Houssin <address@hidden>
Date: 2018-01-10 (Wed, 10 Jan 2018)
Changed paths:
M htdocs/contact/document.php
Log Message:
-----------
Fix: avoid Warning: A non-numeric value encountered
Commit: 8000777864bf54eb4a7b8023ec8949d8175d4543
https://github.com/Dolibarr/dolibarr/commit/8000777864bf54eb4a7b8023ec8949d8175d4543
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-10 (Wed, 10 Jan 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Code comment
Commit: 9253fed75414e75562f56d85c3cde2efb7e3263c
https://github.com/Dolibarr/dolibarr/commit/9253fed75414e75562f56d85c3cde2efb7e3263c
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
Log Message:
-----------
Revert "Code comment"
This reverts commit 8000777864bf54eb4a7b8023ec8949d8175d4543.
Commit: df22a311c242a380cc3e07019a336edc71298aab
https://github.com/Dolibarr/dolibarr/commit/df22a311c242a380cc3e07019a336edc71298aab
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge pull request #8030 from steschuser/5.0
FIX #8029 Unable to make leave request in holyday module
Commit: b5fe953a64d251ca9581fd78ed43d80a373833e6
https://github.com/Dolibarr/dolibarr/commit/b5fe953a64d251ca9581fd78ed43d80a373833e6
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/core/lib/product.lib.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #8035 from pdermody/6.0
Fix #8034 - Surface and volume units are calculated incorrectly
Commit: 79562f8d5b6abb8fcf6c47e14f94dbd75d2913c9
https://github.com/Dolibarr/dolibarr/commit/79562f8d5b6abb8fcf6c47e14f94dbd75d2913c9
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/fourn/class/paiementfourn.class.php
Log Message:
-----------
Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment
Fix wrong address used into PDF model of supplier payment
Commit: 205e715b7f047811499f32c3359a28342ac389a3
https://github.com/Dolibarr/dolibarr/commit/205e715b7f047811499f32c3359a28342ac389a3
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/contact/document.php
Log Message:
-----------
Merge pull request #8046 from hregis/6.0_bug
Fix: avoid Warning: A non-numeric value encountered
Commit: 5adeaf9d76a721ac74b30e560e7fb82d44c479e9
https://github.com/Dolibarr/dolibarr/commit/5adeaf9d76a721ac74b30e560e7fb82d44c479e9
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 387dd967e24b0ea327efd5aa8904021712312037
https://github.com/Dolibarr/dolibarr/commit/387dd967e24b0ea327efd5aa8904021712312037
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 58589b84549b73164109891092816451b3eb3299
https://github.com/Dolibarr/dolibarr/commit/58589b84549b73164109891092816451b3eb3299
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 54228b4f98f5793e8c3f19f52753bb1008cd903a
https://github.com/Dolibarr/dolibarr/commit/54228b4f98f5793e8c3f19f52753bb1008cd903a
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: e9bf6ed4ce7b82a3ede9e2feac6507f9fda9752c
https://github.com/Dolibarr/dolibarr/commit/e9bf6ed4ce7b82a3ede9e2feac6507f9fda9752c
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/contact/document.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: af6b84ba3a0c942285e41bb3bde1c9dcafb82eb9
https://github.com/Dolibarr/dolibarr/commit/af6b84ba3a0c942285e41bb3bde1c9dcafb82eb9
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-11 (Thu, 11 Jan 2018)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/contact/document.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/product/admin/product_tools.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b2c900011c9c...af6b84ba3a0c