[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 659570: add a script for migrating pi
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 659570: add a script for migrating pictures of products |
|
Date: |
Fri, 05 Jun 2015 09:32:18 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 659570a6ab69a663f2a638b08777e4e7b1207031
https://github.com/Dolibarr/dolibarr/commit/659570a6ab69a663f2a638b08777e4e7b1207031
Author: jean <address@hidden>
Date: 2015-05-04 (Mon, 04 May 2015)
Changed paths:
A scripts/product/migrate_picture_path.php
Log Message:
-----------
add a script for migrating pictures of products
Commit: 91885c9d6fee6c785f3de70a059d07b185669043
https://github.com/Dolibarr/dolibarr/commit/91885c9d6fee6c785f3de70a059d07b185669043
Author: Alexis Algoud <address@hidden>
Date: 2015-05-22 (Fri, 22 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX when multicompany was enabled, this function didn't check just on the
good entity (problem when both company use same mask)
Commit: 44c46d68ed4a443962dbdbb8d8ad130f9ee31f82
https://github.com/Dolibarr/dolibarr/commit/44c46d68ed4a443962dbdbb8d8ad130f9ee31f82
Author: Alexis ALGOUD <address@hidden>
Date: 2015-05-23 (Sat, 23 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Remove the useless if
Commit: ab0f8050442e3bc3d61992f9de2e4663f4ea6927
https://github.com/Dolibarr/dolibarr/commit/ab0f8050442e3bc3d61992f9de2e4663f4ea6927
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/adherents/liste.php
M htdocs/contact/list.php
M htdocs/contrat/liste.php
M htdocs/product/liste.php
M htdocs/societe/societe.php
Log Message:
-----------
Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into
fix_multientity_num_check
Commit: dd7febe2b984f0ab2c60d435279e3a0a6374a5c0
https://github.com/Dolibarr/dolibarr/commit/dd7febe2b984f0ab2c60d435279e3a0a6374a5c0
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
replace test by getEntity()
Commit: 148c36c9d375cedc88b2d5cd14259f2c1c4b53d3
https://github.com/Dolibarr/dolibarr/commit/148c36c9d375cedc88b2d5cd14259f2c1c4b53d3
Author: Alexis Algoud <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Log Message:
-----------
Merge branch 'fix_multientity_num_check' of github.com:atm-alexis/dolibarr
into fix_multientity_num_check
Conflicts:
htdocs/core/class/commonobject.class.php
Commit: 4324ed82b39eb91f6c1230c2de689701fa484303
https://github.com/Dolibarr/dolibarr/commit/4324ed82b39eb91f6c1230c2de689701fa484303
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-29 (Fri, 29 May 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #2878 from atm-alexis/fix_multientity_num_check
FIX when multicompany was enabled, isExistingObject check wrong
Commit: a60ab7dd29d5e7e90079bd50859ada99a826ebf9
https://github.com/Dolibarr/dolibarr/commit/a60ab7dd29d5e7e90079bd50859ada99a826ebf9
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-30 (Sat, 30 May 2015)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
Merge pull request #2912 from atm-ph/fix_36_reassort_target
FIX top links menu have target attribute with wrong value
Commit: 19694710b2fef16a94c34175421b25e6721fabfd
https://github.com/Dolibarr/dolibarr/commit/19694710b2fef16a94c34175421b25e6721fabfd
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Keep this constant visible
Commit: 227f2842c2f5bef4446e0a9daac9b749a667517e
https://github.com/Dolibarr/dolibarr/commit/227f2842c2f5bef4446e0a9daac9b749a667517e
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
Prepare version 3.7.1
Commit: 9753097731f56a558b14abde3c9141726e6ab963
https://github.com/Dolibarr/dolibarr/commit/9753097731f56a558b14abde3c9141726e6ab963
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-31 (Sun, 31 May 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.7.1
Commit: cf4308aa3b7d354de7886c60721c29e782975f13
https://github.com/Dolibarr/dolibarr/commit/cf4308aa3b7d354de7886c60721c29e782975f13
Author: Gauthier <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX : When we automatically creta an order from a proposal with workflow
module, if some extrafields of propal don't exist in order object,
insertExtraFields() function tries to insert extrafields in unexistant column
of commande_extrafields table.
Commit: 0523f226cfba8f0527a9e483920837fa8d6b71c4
https://github.com/Dolibarr/dolibarr/commit/0523f226cfba8f0527a9e483920837fa8d6b71c4
Author: phf <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
FIX : when mailing is deleted, the targets list was kept in database
Commit: cc7f2518b62b06ef29be5d1212a251d56e432526
https://github.com/Dolibarr/dolibarr/commit/cc7f2518b62b06ef29be5d1212a251d56e432526
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
Merge pull request #2937 from atm-ph/fix_target_list_emailing
FIX : when mailing is deleted, the targets list was kept in database
Commit: 9ed5d817c4d95afd86570332f433f48a72abb12c
https://github.com/Dolibarr/dolibarr/commit/9ed5d817c4d95afd86570332f433f48a72abb12c
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #2936 from atm-gauthier/3.7
FIX : When we automatically create an order from a proposal with workf…
Commit: d01a777b3ebe1b07a83f20a28ce96a141ec868ce
https://github.com/Dolibarr/dolibarr/commit/d01a777b3ebe1b07a83f20a28ce96a141ec868ce
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
A scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge pull request #2761 from tiaris/3_7_picturepath_script
FIX add a script for migrating pictures of products
Commit: f0257d02b5d12dc754f0e912e22b42796806e8b7
https://github.com/Dolibarr/dolibarr/commit/f0257d02b5d12dc754f0e912e22b42796806e8b7
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M scripts/product/migrate_picture_path.php
Log Message:
-----------
Minor fix
Commit: 4f75ab79dbce0faae28a81abcc81aa6daf9c8a51
https://github.com/Dolibarr/dolibarr/commit/4f75ab79dbce0faae28a81abcc81aa6daf9c8a51
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M build/debian/changelog
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.7.2
Commit: 6e72d3c8cc13972a845a8e868ac32ddaa71901e2
https://github.com/Dolibarr/dolibarr/commit/6e72d3c8cc13972a845a8e868ac32ddaa71901e2
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
FIX Export of tags for contact and member
Commit: 3f1613197e006e29163b4cdaa1e4c2519827e217
https://github.com/Dolibarr/dolibarr/commit/3f1613197e006e29163b4cdaa1e4c2519827e217
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
FIX : If supplier invoice block linked element is display after other
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
Commit: bdaf83a653600ac573397428606749578b5a45f7
https://github.com/Dolibarr/dolibarr/commit/bdaf83a653600ac573397428606749578b5a45f7
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/product/reassort.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: fb29fa486afbbb92be7e5da3ba2b1dcdb84bb2e7
https://github.com/Dolibarr/dolibarr/commit/fb29fa486afbbb92be7e5da3ba2b1dcdb84bb2e7
Author: Florian HENRY <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
FIX : total amount in tpl linked object are not reset
Commit: 3f4ded4780df440d2aae99ef8a9c224a464e3a5d
https://github.com/Dolibarr/dolibarr/commit/3f4ded4780df440d2aae99ef8a9c224a464e3a5d
Author: Gauthier <address@hidden>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
FIX : When we clone a propal, if it has a project which is not assigned to a
third, it was not on new propal because fk_project was always set to empty
string if new propal is for another third.
Commit: f437bd2d6da63002ad366ea5bead1253d27fa98a
https://github.com/Dolibarr/dolibarr/commit/f437bd2d6da63002ad366ea5bead1253d27fa98a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX No check warehouse is provided if module stock is not enabled.
Commit: 195a1b2708655a2d62d00879c574e93d22d7bcdc
https://github.com/Dolibarr/dolibarr/commit/195a1b2708655a2d62d00879c574e93d22d7bcdc
Author: jfefe <address@hidden>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX #2957 : missing $langs object for trigger
Commit: 15060d973c4729c83bc274ba016f6cf7dbf4e1d5
https://github.com/Dolibarr/dolibarr/commit/15060d973c4729c83bc274ba016f6cf7dbf4e1d5
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge pull request #2958 from jfefe/patch-8
FIX #2957 : missing $langs object for trigger
Commit: e78dba809be12d616226a3faa9195c799e7ecbc7
https://github.com/Dolibarr/dolibarr/commit/e78dba809be12d616226a3faa9195c799e7ecbc7
Author: Regis Houssin <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
Commit: f7493de50c4c16bf698f04b4d887a9f67442a1d7
https://github.com/Dolibarr/dolibarr/commit/f7493de50c4c16bf698f04b4d887a9f67442a1d7
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix : supplier order clone was buggy if notes contains apostrophe
Commit: d138e441f887d4a83ac6b48ee625c25c142fb994
https://github.com/Dolibarr/dolibarr/commit/d138e441f887d4a83ac6b48ee625c25c142fb994
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #2964 from atm-maxime/3.6
Fix : supplier order clone was buggy if notes contains apostrophe
Commit: a8433aadbecc5a0218b3f79e3b3ce640f3cb7259
https://github.com/Dolibarr/dolibarr/commit/a8433aadbecc5a0218b3f79e3b3ce640f3cb7259
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2962 from hregis/3.7_bug2
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Commit: 3c8d54d55fc087a13c9a7b4201c02bdf9658bf28
https://github.com/Dolibarr/dolibarr/commit/3c8d54d55fc087a13c9a7b4201c02bdf9658bf28
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge pull request #2938 from FHenry/3.6
FIX : If supplier invoice block linked element is display after other block
total HT amount is not reset to 0 and sum other block (like customer orders
values)
Commit: 51d275ee7746fac9fea4d660e0ef7511c5598b68
https://github.com/Dolibarr/dolibarr/commit/51d275ee7746fac9fea4d660e0ef7511c5598b68
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #2941 from atm-gauthier/3.7
FIX : When we clone a propal, if it has a project which is not assign…
Commit: 1252a500ce191c6f958537699ac7d11a1fdf1ef6
https://github.com/Dolibarr/dolibarr/commit/1252a500ce191c6f958537699ac7d11a1fdf1ef6
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
Commit: 43ed48896ab1325112b4c3350bc15b7c4a869dcb
https://github.com/Dolibarr/dolibarr/commit/43ed48896ab1325112b4c3350bc15b7c4a869dcb
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
A scripts/product/migrate_picture_path.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Compare:
https://github.com/Dolibarr/dolibarr/compare/91f4fccb21a0...43ed48896ab1