[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ceccd5: Fix prev situation invoice se
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ceccd5: Fix prev situation invoice selection |
Date: |
Thu, 27 Sep 2018 03:56:12 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: ceccd5a5100f1ca7c050698a625fa2b25dee1238
https://github.com/Dolibarr/dolibarr/commit/ceccd5a5100f1ca7c050698a625fa2b25dee1238
Author: John BOTELLA <address@hidden>
Date: 2018-09-24 (Mon, 24 Sep 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix prev situation invoice selection
Commit: 26d585ffbe11c012c7d983dfb21c5486d78e0214
https://github.com/Dolibarr/dolibarr/commit/26d585ffbe11c012c7d983dfb21c5486d78e0214
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-24 (Mon, 24 Sep 2018)
Changed paths:
M htdocs/langs/en_US/boxes.lang
Log Message:
-----------
Use latest instead of last
Commit: b1380a690242a354ac02712a39f82b18bc5b7125
https://github.com/Dolibarr/dolibarr/commit/b1380a690242a354ac02712a39f82b18bc5b7125
Author: John BOTELLA <address@hidden>
Date: 2018-09-24 (Mon, 24 Sep 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX situation invoice total with credit note
Commit: fc7c0ce52188776dd34f0aeeb8e7c4ca3ce771b7
https://github.com/Dolibarr/dolibarr/commit/fc7c0ce52188776dd34f0aeeb8e7c4ca3ce771b7
Author: gauthier <address@hidden>
Date: 2018-09-24 (Mon, 24 Sep 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
FIX : need to filter on current entity on replenish
Commit: df64961c6bdbbcf56f78854d5478f52e3f6c5a99
https://github.com/Dolibarr/dolibarr/commit/df64961c6bdbbcf56f78854d5478f52e3f6c5a99
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-24 (Mon, 24 Sep 2018)
Changed paths:
M htdocs/admin/tools/listsessions.php
Log Message:
-----------
FIX nb of session in title
Commit: d15c52db3b8e9614e868e02ed96761ffc8017611
https://github.com/Dolibarr/dolibarr/commit/d15c52db3b8e9614e868e02ed96761ffc8017611
Author: Frédéric FRANCE <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/core/class/rssparser.class.php
Log Message:
-----------
Update rssparser.class.php
Commit: 791c373db5b1f1f71d8989ffd84ec626c6cba64a
https://github.com/Dolibarr/dolibarr/commit/791c373db5b1f1f71d8989ffd84ec626c6cba64a
Author: John BOTELLA <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX credit note progression
Commit: 022f842cb09775fd2577348a743153382fbf5e29
https://github.com/Dolibarr/dolibarr/commit/022f842cb09775fd2577348a743153382fbf5e29
Author: John BOTELLA <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Fix display good progress for new situation invoices
Commit: 515acbfee2e0cd684a60f55916e2ef9672885639
https://github.com/Dolibarr/dolibarr/commit/515acbfee2e0cd684a60f55916e2ef9672885639
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
FIX Bad position of hook formattachOptions call
Commit: e39e54503ee100d9e865dc1b781cee4643c98f04
https://github.com/Dolibarr/dolibarr/commit/e39e54503ee100d9e865dc1b781cee4643c98f04
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Fix responsive
Commit: a9f7bdead68054eac806b328383526373f5ded42
https://github.com/Dolibarr/dolibarr/commit/a9f7bdead68054eac806b328383526373f5ded42
Author: Frédéric FRANCE <address@hidden>
Date: 2018-09-25 (Tue, 25 Sep 2018)
Changed paths:
M htdocs/core/tpl/bloc_showhide.tpl.php
Log Message:
-----------
fix Option MAIN_DISABLE_NOTES_TAB #9611
Commit: 92a3faeaf76df2b31e2fdc2302e3d33e0aa05abe
https://github.com/Dolibarr/dolibarr/commit/92a3faeaf76df2b31e2fdc2302e3d33e0aa05abe
Author: Frédéric FRANCE <address@hidden>
Date: 2018-09-26 (Wed, 26 Sep 2018)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
add try catch for swiftmailer
Commit: 1bac3a0ccfc4ce81a76eca8b3734b0d22d8f14ba
https://github.com/Dolibarr/dolibarr/commit/1bac3a0ccfc4ce81a76eca8b3734b0d22d8f14ba
Author: Frédéric FRANCE <address@hidden>
Date: 2018-09-26 (Wed, 26 Sep 2018)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
swiftmailer is doing encodetorfc2822
Commit: af93fc74846f500b26c96a34b1b3729e0598ef19
https://github.com/Dolibarr/dolibarr/commit/af93fc74846f500b26c96a34b1b3729e0598ef19
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-09-26 (Wed, 26 Sep 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: showOptionals: column mismatches
Commit: 2b8ccc0c815391b6e5880dd08fc160578d1ebc39
https://github.com/Dolibarr/dolibarr/commit/2b8ccc0c815391b6e5880dd08fc160578d1ebc39
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX Link template invoice to contract
Commit: e72dc26532710091284a65e2589a82d5679fce7a
https://github.com/Dolibarr/dolibarr/commit/e72dc26532710091284a65e2589a82d5679fce7a
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #9603 from atm-john/Fix_situation_invoice_selection
FIX previous situation invoice selection
Commit: ff3f1e933ae21796a02eb5adcbc8a8a2ba3fc2b6
https://github.com/Dolibarr/dolibarr/commit/ff3f1e933ae21796a02eb5adcbc8a8a2ba3fc2b6
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Update replenish.php
Commit: 46363a7705ae98d79fe3d5ee38e8dfd509f07ccb
https://github.com/Dolibarr/dolibarr/commit/46363a7705ae98d79fe3d5ee38e8dfd509f07ccb
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge pull request #9607 from atm-gauthier/7.0_fix_replenish_entity
FIX : need to filter on current entity on replenish
Commit: 77341470e1aa47d891ace5370b186cadb9712a20
https://github.com/Dolibarr/dolibarr/commit/77341470e1aa47d891ace5370b186cadb9712a20
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/rssparser.class.php
Log Message:
-----------
Merge pull request #9608 from frederic34/patch-10
comparaison of two boolean in rssparser.class.php
Commit: e3b1cb9fdb72e62980e2a6545541426021d67566
https://github.com/Dolibarr/dolibarr/commit/e3b1cb9fdb72e62980e2a6545541426021d67566
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Update facture.class.php
Commit: ee8b5030a0264675872ab382adac557c18f331df
https://github.com/Dolibarr/dolibarr/commit/ee8b5030a0264675872ab382adac557c18f331df
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #9610 from atm-john/FIX_situation_credit_note
Fix situation credit note
Commit: bc5b794b1af962d699abec26eaedc5b93ab76035
https://github.com/Dolibarr/dolibarr/commit/bc5b794b1af962d699abec26eaedc5b93ab76035
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/tpl/bloc_showhide.tpl.php
Log Message:
-----------
Merge pull request #9613 from frederic34/patch-11
FIX Option MAIN_DISABLE_NOTES_TAB #9611
Commit: 2d88b69cf60a32311c7ed203bd4389df25121a39
https://github.com/Dolibarr/dolibarr/commit/2d88b69cf60a32311c7ed203bd4389df25121a39
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Merge pull request #9616 from frederic34/patch-14
add try catch for swiftmailer
Commit: fee46ac8457ccd1db79615145ce33bb48dc20af3
https://github.com/Dolibarr/dolibarr/commit/fee46ac8457ccd1db79615145ce33bb48dc20af3
Author: Carsten Brandt <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/install/mysql/data/llx_accounting_account_de.sql
Log Message:
-----------
Update german accounting file to use rowid
- fix "TODO Fix this file to use rowid"
Commit: 4c8664b29733c62eaa3fc82cd2b0b5f7a663f34b
https://github.com/Dolibarr/dolibarr/commit/4c8664b29733c62eaa3fc82cd2b0b5f7a663f34b
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns
FIX: showOptionals: column mismatches
Commit: 96c1814793bba17ba56d83d7b29d584cd6b2f97d
https://github.com/Dolibarr/dolibarr/commit/96c1814793bba17ba56d83d7b29d584cd6b2f97d
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/admin/company.php
Log Message:
-----------
FIX XSS vulnerability reported by Mary Princy E
Commit: 7b86776f6b1039111cec8dde34f1e8716ce7601e
https://github.com/Dolibarr/dolibarr/commit/7b86776f6b1039111cec8dde34f1e8716ce7601e
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/lib/tax.lib.php
Log Message:
-----------
Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression
on feature to report vat by rate when rate is zero
Commit: 291d477f6567b499adf8264e136edfd303a0a04f
https://github.com/Dolibarr/dolibarr/commit/291d477f6567b499adf8264e136edfd303a0a04f
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/rssparser.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/commonobject.class.php
Commit: 6e7fd15e1e14f615224bd872fc57c229860be777
https://github.com/Dolibarr/dolibarr/commit/6e7fd15e1e14f615224bd872fc57c229860be777
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 575c63f87d6d4ce2f5b1a94112971c824cb92552
https://github.com/Dolibarr/dolibarr/commit/575c63f87d6d4ce2f5b1a94112971c824cb92552
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/CMailFile.class.php
Commit: 62b31df069e3c2bfa8083493aeaa6417fac27319
https://github.com/Dolibarr/dolibarr/commit/62b31df069e3c2bfa8083493aeaa6417fac27319
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/admin/company.php
M htdocs/admin/tools/listsessions.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/list.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
Commit: e252a5f046d6fa87badc21793df64e5b5e8491e0
https://github.com/Dolibarr/dolibarr/commit/e252a5f046d6fa87badc21793df64e5b5e8491e0
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-27 (Thu, 27 Sep 2018)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/card.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.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/expensereport/doc/pdf_standard.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/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/ticket/mod_ticket_universal.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/langs/fr_FR/admin.lang
M htdocs/public/members/new.php
M htdocs/public/payment/paymentok.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/60c74a625551...e252a5f046d6
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.