[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dbc017: Fix bad merge
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dbc017: Fix bad merge |
|
Date: |
Mon, 19 Sep 2016 05:05:34 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: dbc017ae45c83ad5a2299592ddf84be8ad988ebb
https://github.com/Dolibarr/dolibarr/commit/dbc017ae45c83ad5a2299592ddf84be8ad988ebb
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix bad merge
Commit: d6ea6d172561ae5ffda70fec8417730033470d95
https://github.com/Dolibarr/dolibarr/commit/d6ea6d172561ae5ffda70fec8417730033470d95
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/fourn/commande/list.php
Log Message:
-----------
Fix deprecated option should be on
Commit: ac509d6565f2cb059c1e99a3c99ad5f765fd203e
https://github.com/Dolibarr/dolibarr/commit/ac509d6565f2cb059c1e99a3c99ad5f765fd203e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/opensurvey/card.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/public/opensurvey/studs.php
Log Message:
-----------
FIX #2991
Commit: 34c19f9cf1493fd556f1511f26c8d0b8ec7b2b94
https://github.com/Dolibarr/dolibarr/commit/34c19f9cf1493fd556f1511f26c8d0b8ec7b2b94
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/opensurvey/card.php
Log Message:
-----------
On non public page, access with a bad fetch id can return error
Commit: bd734de437502297e2658b43c693be887db4dc24
https://github.com/Dolibarr/dolibarr/commit/bd734de437502297e2658b43c693be887db4dc24
Author: phf <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Fix bad query
Commit: 20141ec9bc0203f9585e2fa89e96cf9756ea9ab8
https://github.com/Dolibarr/dolibarr/commit/20141ec9bc0203f9585e2fa89e96cf9756ea9ab8
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
Log Message:
-----------
Fix default value of new table
Commit: 0cf5ee2f28b751baee5ba5456141f3b2073730fc
https://github.com/Dolibarr/dolibarr/commit/0cf5ee2f28b751baee5ba5456141f3b2073730fc
Author: phf <address@hidden>
Date: 2016-09-13 (Tue, 13 Sep 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix clone object with "link" as extrafield
Commit: 8b13c36670af7263ab4336b9825b7e407012c4e9
https://github.com/Dolibarr/dolibarr/commit/8b13c36670af7263ab4336b9825b7e407012c4e9
Author: Juanjo Menent <address@hidden>
Date: 2016-09-14 (Wed, 14 Sep 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Merge pull request #5735 from atm-ph/fix_4.0_error_sql
Fix bad query
Commit: abe7d91bb53ed1d52bac97b9d50b1eb6d82025a9
https://github.com/Dolibarr/dolibarr/commit/abe7d91bb53ed1d52bac97b9d50b1eb6d82025a9
Author: Juanjo Menent <address@hidden>
Date: 2016-09-14 (Wed, 14 Sep 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #5739 from atm-ph/fix_4.0_clone_object
Fix clone object with "link" as extrafield
Commit: 93b216e628d37e93e8d187477ecec95024096543
https://github.com/Dolibarr/dolibarr/commit/93b216e628d37e93e8d187477ecec95024096543
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-09-15 (Thu, 15 Sep 2016)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
FIX: #5699
Commit: d0d14ea959d49e93d7ea8e869fa7e7d7f79b3b87
https://github.com/Dolibarr/dolibarr/commit/d0d14ea959d49e93d7ea8e869fa7e7d7f79b3b87
Author: Juanjo Menent <address@hidden>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
Merge pull request #5753 from olsesacl/4.0
FIX: #5699 Error when creating database backup dump file
Commit: a4c3a4588d8cd5e274c2768858b8d174b6639f36
https://github.com/Dolibarr/dolibarr/commit/a4c3a4588d8cd5e274c2768858b8d174b6639f36
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-18 (Sun, 18 Sep 2016)
Changed paths:
M htdocs/comm/card.php
M htdocs/fourn/card.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/societe/agenda.php
M htdocs/societe/commerciaux.php
M htdocs/societe/consumption.php
M htdocs/societe/document.php
M htdocs/societe/note.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
M htdocs/societe/project.php
M htdocs/societe/rib.php
M htdocs/societe/societecontact.php
Log Message:
-----------
FIX link "back to list" was not visible.
Commit: 5fb55cc9de9af9b8125201c97162acc5d1d8cfdd
https://github.com/Dolibarr/dolibarr/commit/5fb55cc9de9af9b8125201c97162acc5d1d8cfdd
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-18 (Sun, 18 Sep 2016)
Changed paths:
M htdocs/contrat/card.php
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Fix css
Commit: 0c342284f0607cae5b331ade3fa01fb6f08d4a01
https://github.com/Dolibarr/dolibarr/commit/0c342284f0607cae5b331ade3fa01fb6f08d4a01
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-18 (Sun, 18 Sep 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/utils.class.php
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 5602bcd44005077b387a9fd5dd2a674cdfa12cd0
https://github.com/Dolibarr/dolibarr/commit/5602bcd44005077b387a9fd5dd2a674cdfa12cd0
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/list.php
Log Message:
-----------
NEW Add status Done on interventions
Commit: 079ed8811963945ea8df2d8572121603c51dfa17
https://github.com/Dolibarr/dolibarr/commit/079ed8811963945ea8df2d8572121603c51dfa17
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix missing css
Commit: 4f842fd2cb38e802f52e99701e1ac02b82eb3685
https://github.com/Dolibarr/dolibarr/commit/4f842fd2cb38e802f52e99701e1ac02b82eb3685
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.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/product/stock/card.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Uniformize look and feel
Commit: c4c7ccc22609ae69b10ba08dd46b37e742458e45
https://github.com/Dolibarr/dolibarr/commit/c4c7ccc22609ae69b10ba08dd46b37e742458e45
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M htdocs/comm/card.php
M htdocs/contrat/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/card.php
M htdocs/fourn/commande/list.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/public/opensurvey/studs.php
M htdocs/societe/agenda.php
M htdocs/societe/commerciaux.php
M htdocs/societe/consumption.php
M htdocs/societe/document.php
M htdocs/societe/note.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
M htdocs/societe/project.php
M htdocs/societe/rib.php
M htdocs/societe/societecontact.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/af28a6780380...c4c7ccc22609