[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c2bee0: FIX #6088
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c2bee0: FIX #6088 |
Date: |
Wed, 14 Dec 2016 03:29:58 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c2bee0f9375035cd96645f3e9bebe968342d667a
https://github.com/Dolibarr/dolibarr/commit/c2bee0f9375035cd96645f3e9bebe968342d667a
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX #6088
Commit: 829ff2299e7a6e3ae01abf8fef953e14d0750190
https://github.com/Dolibarr/dolibarr/commit/829ff2299e7a6e3ae01abf8fef953e14d0750190
Author: Juanjo Menent <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
R htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
Fix: Delete surplus migration file
Commit: 97e21cb7758d9ad24534f4c639eaa0e01da40b48
https://github.com/Dolibarr/dolibarr/commit/97e21cb7758d9ad24534f4c639eaa0e01da40b48
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix : delete product was not possible if batch stock
Commit: 46d84f8f1108f7ea8970b12037e3cf1a9d7ca49c
https://github.com/Dolibarr/dolibarr/commit/46d84f8f1108f7ea8970b12037e3cf1a9d7ca49c
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
R htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
Merge pull request #6111 from simnandez/3.8
Fix: Delete surplus migration file
Commit: f49d332b7399f0bd9197f776310eacaa96495f6a
https://github.com/Dolibarr/dolibarr/commit/f49d332b7399f0bd9197f776310eacaa96495f6a
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #6113 from atm-maxime/3.8
Fix : delete product was not possible if batch stock
Commit: 5a2b8ff53cce86971b56299c7b6592819df1bb75
https://github.com/Dolibarr/dolibarr/commit/5a2b8ff53cce86971b56299c7b6592819df1bb75
Author: Juanjo Menent <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/compta/localtax/clients.php
Log Message:
-----------
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
Commit: 6e9d6b4e496228a03e405ce6d3055ae1de84664f
https://github.com/Dolibarr/dolibarr/commit/6e9d6b4e496228a03e405ce6d3055ae1de84664f
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/compta/localtax/clients.php
Log Message:
-----------
Merge pull request #6128 from simnandez/3.9
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
Commit: 56aafa4660cb7b5e262943cff1b561c09d73c07c
https://github.com/Dolibarr/dolibarr/commit/56aafa4660cb7b5e262943cff1b561c09d73c07c
Author: Juanjo Menent <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Fix #5646 Error editing Sell Price on products/services
Commit: b42a2616bc5ff0fb35428914bce16dd7b0ef3af1
https://github.com/Dolibarr/dolibarr/commit/b42a2616bc5ff0fb35428914bce16dd7b0ef3af1
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths:
M build/pad/DoliWamp.pml
M build/pad/Dolibarr.pml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Commit: 9b436ce871dbd8d9086fb92039a13ae526cb4d01
https://github.com/Dolibarr/dolibarr/commit/9b436ce871dbd8d9086fb92039a13ae526cb4d01
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths:
M htdocs/compta/localtax/clients.php
M htdocs/core/class/extrafields.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/product/class/product.class.php
Commit: 7fd75c793aea3b0b003f40c4d97be86c4f29dc43
https://github.com/Dolibarr/dolibarr/commit/7fd75c793aea3b0b003f40c4d97be86c4f29dc43
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX Regression when deleting product
Commit: 95d8faef0431aca103439db56eb00c7ff7a9ea7d
https://github.com/Dolibarr/dolibarr/commit/95d8faef0431aca103439db56eb00c7ff7a9ea7d
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/product/class/product.class.php
Commit: 5c4ab99a9a96dabae23144134ad295c4e9bf13fe
https://github.com/Dolibarr/dolibarr/commit/5c4ab99a9a96dabae23144134ad295c4e9bf13fe
Author: Juanjo Menent <address@hidden>
Date: 2016-12-11 (Sun, 11 Dec 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #6132 from simnandez/3.9
Fix #5646 Error editing Sell Price on products/services
Commit: 43d18cd70cb19b2e552fa3179ccf7b3564b1a6f1
https://github.com/Dolibarr/dolibarr/commit/43d18cd70cb19b2e552fa3179ccf7b3564b1a6f1
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX if a supplier price reference is changed after creating an order, we
can't clone order.
Commit: 530d3503f5b11fb29aa662b942f87180631493f1
https://github.com/Dolibarr/dolibarr/commit/530d3503f5b11fb29aa662b942f87180631493f1
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
Commit: 56b3f2c011a11d898fbcbd759325daf18361d53f
https://github.com/Dolibarr/dolibarr/commit/56b3f2c011a11d898fbcbd759325daf18361d53f
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
Commit: af407a094a2b4ff8e03393e2ba1feabb55de6ae2
https://github.com/Dolibarr/dolibarr/commit/af407a094a2b4ff8e03393e2ba1feabb55de6ae2
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/core/class/smtps.class.php
Log Message:
-----------
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
Commit: e4dd0208874d20508c9db3acc810680417ee1810
https://github.com/Dolibarr/dolibarr/commit/e4dd0208874d20508c9db3acc810680417ee1810
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/core/class/smtps.class.php
Log Message:
-----------
Fix bad concat
Commit: d2e4888bdd0bee5dc37ed00bfe9a73efd2ccb0a9
https://github.com/Dolibarr/dolibarr/commit/d2e4888bdd0bee5dc37ed00bfe9a73efd2ccb0a9
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/core/class/smtps.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ecab7cb70eb71bd3f36b55055fc44e61ca991020
https://github.com/Dolibarr/dolibarr/commit/ecab7cb70eb71bd3f36b55055fc44e61ca991020
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/compta/localtax/clients.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/product/class/product.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/9f0528f5f18c...ecab7cb70eb7