[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d658a8: FIX #6677 Expired contracts d
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d658a8: FIX #6677 Expired contracts dashboard box does not... |
Date: |
Wed, 10 May 2017 15:03:35 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d658a833c98fad5e2b21ca4c5f3ad44e51ad4717
https://github.com/Dolibarr/dolibarr/commit/d658a833c98fad5e2b21ca4c5f3ad44e51ad4717
Author: Marcos García de La Fuente <address@hidden>
Date: 2017-05-01 (Mon, 01 May 2017)
Changed paths:
M htdocs/core/boxes/box_services_expired.php
Log Message:
-----------
FIX #6677 Expired contracts dashboard box does not show the name of the
thirdparty
Close #6677
Commit: 4b42a5fd86cb2ca914c06205fd14fcf48aefe347
https://github.com/Dolibarr/dolibarr/commit/4b42a5fd86cb2ca914c06205fd14fcf48aefe347
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-05 (Fri, 05 May 2017)
Changed paths:
M htdocs/core/boxes/box_services_expired.php
Log Message:
-----------
Merge pull request #6775 from marcosgdf/bug-6677
FIX #6677 Expired contracts dashboard box does not show the name of the
thirdparty
Commit: 8c75fc0e52591c7463b8f4d01b3e25166dfef16a
https://github.com/Dolibarr/dolibarr/commit/8c75fc0e52591c7463b8f4d01b3e25166dfef16a
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-07 (Sun, 07 May 2017)
Changed paths:
M htdocs/compta/bank/class/account.class.php
Log Message:
-----------
New-Caledonia uses the same bank accounts patterns than France
Commit: 2b7dcfa56df90332ae589123177fd8e663cb358b
https://github.com/Dolibarr/dolibarr/commit/2b7dcfa56df90332ae589123177fd8e663cb358b
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
Log Message:
-----------
Add missing vat_src_code field to predefined invoices table
Commit: dbcb60433b5ca60bdb7d50d1a61fcf899edda716
https://github.com/Dolibarr/dolibarr/commit/dbcb60433b5ca60bdb7d50d1a61fcf899edda716
Author: Ferran Marcet <address@hidden>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX: Correction with author and validator user on orders
Commit: 6cac627117974495ebc0687a6dce55ee2a87fe4d
https://github.com/Dolibarr/dolibarr/commit/6cac627117974495ebc0687a6dce55ee2a87fe4d
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Add support for localtaxes to predefined invoices
Commit: c88656edb4ef5e6cf8024716b94140fa0d7b0eb5
https://github.com/Dolibarr/dolibarr/commit/c88656edb4ef5e6cf8024716b94140fa0d7b0eb5
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Fix PHPDOC comments
Commit: fb561bae1bdd268bb3781c9b4720fde8060ddbd9
https://github.com/Dolibarr/dolibarr/commit/fb561bae1bdd268bb3781c9b4720fde8060ddbd9
Author: Laurent Dinclaux <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Fix recurring invoices generation when using the cron url
Commit: 199b4dfeb528d078f2c0495e2975dd0b92843029
https://github.com/Dolibarr/dolibarr/commit/199b4dfeb528d078f2c0495e2975dd0b92843029
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/filefunc.inc.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
Log Message:
-----------
Merge pull request #6816 from Gecka-Apps/5.0-fixes
Add local taxes support to predefined invoices
Commit: e48ba067303107b476979527f4a414da7e800795
https://github.com/Dolibarr/dolibarr/commit/e48ba067303107b476979527f4a414da7e800795
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/societe/rib.php
Log Message:
-----------
Fix generation of sepa mandate with multicompany
Commit: 002bebd83796f3cbee250a393da734c90d1384dc
https://github.com/Dolibarr/dolibarr/commit/002bebd83796f3cbee250a393da734c90d1384dc
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_bank_account.sql
Log Message:
-----------
Fix missing extraparams make sql syntax error
Commit: d570df50899d105d01f8db97f5633be2554d5052
https://github.com/Dolibarr/dolibarr/commit/d570df50899d105d01f8db97f5633be2554d5052
Author: BENKE Charlie <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
Log Message:
-----------
inverted value between FRST & RECUR
Commit: 52de60c49be5099bae97f7147e7615f92a4223e3
https://github.com/Dolibarr/dolibarr/commit/52de60c49be5099bae97f7147e7615f92a4223e3
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/filefunc.inc.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 823e5b48e3e39e1de59d88fdbb387df8e8c232f2
https://github.com/Dolibarr/dolibarr/commit/823e5b48e3e39e1de59d88fdbb387df8e8c232f2
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
Log Message:
-----------
Code comment
Commit: 5a96ae54b9edde7df8be5a39dea4701f281aae69
https://github.com/Dolibarr/dolibarr/commit/5a96ae54b9edde7df8be5a39dea4701f281aae69
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/class/html.formfile.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/societe/rib.php
Log Message:
-----------
FIX Link to files on bank account tab broken with multicompany
FIX Link to preview on thirdparty broken with multicompany
Commit: d410a320d72e569b5148b0a9a0da39831a4912e9
https://github.com/Dolibarr/dolibarr/commit/d410a320d72e569b5148b0a9a0da39831a4912e9
Author: jfefe <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/class/translate.class.php
Log Message:
-----------
WIP #6504: CVE-2017-7886
'defaultlang' attribute was not filtered before database request which cause an
SQL injection.
Commit: ec4e416a6c1075e1c68d146d95fdd5c7f4e85685
https://github.com/Dolibarr/dolibarr/commit/ec4e416a6c1075e1c68d146d95fdd5c7f4e85685
Author: Benoit <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/compta/bank/class/account.class.php
Log Message:
-----------
Fix bug xhen insert new bankline
Commit: 23af50ad2a276618c0e1319c12f51feb51053cfa
https://github.com/Dolibarr/dolibarr/commit/23af50ad2a276618c0e1319c12f51feb51053cfa
Author: Benoit <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Add fk_facture_fourn element to fetch lines objects
Commit: 7ab151dc0d581683f2556c89336d91621ccdb771
https://github.com/Dolibarr/dolibarr/commit/7ab151dc0d581683f2556c89336d91621ccdb771
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/compta/bank/class/account.class.php
Log Message:
-----------
Merge pull request #6809 from Gecka-Apps/5.0
New-Caledonia uses the same bank accounts patterns than France
Commit: 61a4382bd8e78834c63d99122b7f8e81800b4c9b
https://github.com/Dolibarr/dolibarr/commit/61a4382bd8e78834c63d99122b7f8e81800b4c9b
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #6814 from fmarcet/3.9
FIX: Correction with author and validator user on orders
Commit: 2ad4dbdae25eb6dab9e17ed327598712101cfc13
https://github.com/Dolibarr/dolibarr/commit/2ad4dbdae25eb6dab9e17ed327598712101cfc13
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Merge pull request #6817 from Gecka-Apps/5.0-cronfix
Fix recurring invoices generation when using the cron url
Commit: d19d733f95b47aabd1b42aff445665876cba4048
https://github.com/Dolibarr/dolibarr/commit/d19d733f95b47aabd1b42aff445665876cba4048
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/public/cron/cron_run_jobs.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: d7b142beb77a6b32b41a7a0c035594e414533cef
https://github.com/Dolibarr/dolibarr/commit/d7b142beb77a6b32b41a7a0c035594e414533cef
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/class/translate.class.php
Log Message:
-----------
Merge pull request #6830 from jfefe/patch-12
Fix #6504: CVE-2017-7886
Commit: b2e9d4cc21d990b0ddd2c9f00e868ccad3f4672b
https://github.com/Dolibarr/dolibarr/commit/b2e9d4cc21d990b0ddd2c9f00e868ccad3f4672b
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/class/translate.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ef5fd503cd1c9c5f3fdf43e81150d6893772b3ff
https://github.com/Dolibarr/dolibarr/commit/ef5fd503cd1c9c5f3fdf43e81150d6893772b3ff
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/core/boxes/box_services_expired.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 922fa088b4b6099a2ab9b5c380cd0393dff4b0ef
https://github.com/Dolibarr/dolibarr/commit/922fa088b4b6099a2ab9b5c380cd0393dff4b0ef
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-10 (Wed, 10 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/class/translate.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/boxes/box_services_expired.php
Commit: 30cf3f2bdae7c64b4c7643865e6e05b45a2cdd8a
https://github.com/Dolibarr/dolibarr/commit/30cf3f2bdae7c64b4c7643865e6e05b45a2cdd8a
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-11 (Thu, 11 May 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_bank_account.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
M htdocs/product/class/product.class.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/societe/rib.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
Compare:
https://github.com/Dolibarr/dolibarr/compare/2da0a129d103...30cf3f2bdae7