[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2aa399: Fix :: Sql problem for fresh
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2aa399: Fix :: Sql problem for fresh install on resource t... |
|
Date: |
Sat, 30 Aug 2014 09:29:02 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2aa3995b73d808fd4a325000d312e2f95c4ec26b
https://github.com/Dolibarr/dolibarr/commit/2aa3995b73d808fd4a325000d312e2f95c4ec26b
Author: aspangaro <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
M htdocs/install/mysql/tables/llx_c_type_resource.sql
Log Message:
-----------
Fix :: Sql problem for fresh install on resource table // Ok in migration
script
Commit: 03f642e8619d4690cef422b965de10ccd971438b
https://github.com/Dolibarr/dolibarr/commit/03f642e8619d4690cef422b965de10ccd971438b
Author: aspangaro <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge branch 'Upstream/3.6'
Commit: c21b3894622c5dab1391be4a80cd70482e4fd75a
https://github.com/Dolibarr/dolibarr/commit/c21b3894622c5dab1391be4a80cd70482e4fd75a
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/includes/ckeditor/contents.css
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: Pb with focus position with ckeditor
Commit: d485e270b99c0a391308fb925b46934380061083
https://github.com/Dolibarr/dolibarr/commit/d485e270b99c0a391308fb925b46934380061083
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/cashdesk/affContenu.php
Log Message:
-----------
Fix: menu param is not inside allowed list
Commit: 8f18db8e3fce59553e92b5ebe0a588007ea16423
https://github.com/Dolibarr/dolibarr/commit/8f18db8e3fce59553e92b5ebe0a588007ea16423
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/includes/ckeditor/contents.css
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: a32791f79dd071876392de670c3e8a7ae7b749d1
https://github.com/Dolibarr/dolibarr/commit/a32791f79dd071876392de670c3e8a7ae7b749d1
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-21 (Thu, 21 Aug 2014)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #1839 from aspangaro/3.6
Fix :: Sql problem for fresh install on resource table
Commit: a2f0866c0c036b015cc39de9f74b9f590e55a299
https://github.com/Dolibarr/dolibarr/commit/a2f0866c0c036b015cc39de9f74b9f590e55a299
Author: aspangaro <address@hidden>
Date: 2014-08-22 (Fri, 22 Aug 2014)
Changed paths:
M htdocs/cashdesk/affContenu.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/includes/ckeditor/contents.css
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch 'Upstream/3.6'
Commit: a353f816e311b340b2b84e85785006fb82449190
https://github.com/Dolibarr/dolibarr/commit/a353f816e311b340b2b84e85785006fb82449190
Author: Alexis Algoud <address@hidden>
Date: 2014-08-23 (Sat, 23 Aug 2014)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
FIX error sql on update ficheinter
Commit: a97241f71682f59ff629c881b0566696becd42b1
https://github.com/Dolibarr/dolibarr/commit/a97241f71682f59ff629c881b0566696becd42b1
Author: Cubexed <address@hidden>
Date: 2014-08-23 (Sat, 23 Aug 2014)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix unable to delete order line
Calling trigger without having globalized $conf causes error and cancels delete
operation, this commit adds the missing
2014-08-23 16:52:05 ERR 127.0.0.1 Interfaces::run_triggers was
called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user=
langs= conf=
Commit: b561d48b5f4f4828ec1e83c6e8df18f4bc710551
https://github.com/Dolibarr/dolibarr/commit/b561d48b5f4f4828ec1e83c6e8df18f4bc710551
Author: aspangaro <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Merge branch 'Upstream/3.6'
Commit: b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
https://github.com/Dolibarr/dolibarr/commit/b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
Author: aspangaro <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
Log Message:
-----------
Fix llx_c_type_resource when you update from a 3.6-beta
Commit: ca7ff0ecfab48f79c1eaf4b1f106f0f5479fddfb
https://github.com/Dolibarr/dolibarr/commit/ca7ff0ecfab48f79c1eaf4b1f106f0f5479fddfb
Author: Regis Houssin <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: error in strict mode
Commit: 1e28fd354146ab4a7e65dcbbcba92e5b84daa8b1
https://github.com/Dolibarr/dolibarr/commit/1e28fd354146ab4a7e65dcbbcba92e5b84daa8b1
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M build/debian/dolibarr.postinst
Log Message:
-----------
Fix: syntax error
Commit: 21ff810952e6fe4411b8396e8c29a9cbefaddd60
https://github.com/Dolibarr/dolibarr/commit/21ff810952e6fe4411b8396e8c29a9cbefaddd60
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 12c67529712d924f16989b92f421ec4d0fe89485
https://github.com/Dolibarr/dolibarr/commit/12c67529712d924f16989b92f421ec4d0fe89485
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/product/document.php
Log Message:
-----------
Fix: Can upload files on services.
Commit: 4405f17f2280395c83260911b439b808a2b2a437
https://github.com/Dolibarr/dolibarr/commit/4405f17f2280395c83260911b439b808a2b2a437
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 0674667932a71965b8ffa25d71a6edffac916109
https://github.com/Dolibarr/dolibarr/commit/0674667932a71965b8ffa25d71a6edffac916109
Author: Regis Houssin <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix: error with php strict mode
Commit: 61ae2f3f37fab514d8c355f6d08c565a13f71010
https://github.com/Dolibarr/dolibarr/commit/61ae2f3f37fab514d8c355f6d08c565a13f71010
Author: Philippe GRAND <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
fix : missing translation
Commit: 08c621037c76f0a1656f41ecec8dd5f878a5459a
https://github.com/Dolibarr/dolibarr/commit/08c621037c76f0a1656f41ecec8dd5f878a5459a
Author: Philippe GRAND <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
fix : missing code for extrafields
Commit: 34561906fcb34aa3cd88a47ef48855e6bdaa333d
https://github.com/Dolibarr/dolibarr/commit/34561906fcb34aa3cd88a47ef48855e6bdaa333d
Author: Regis Houssin <address@hidden>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
Log Message:
-----------
Fix: strict mode anarchy ;-)
check your variable please
Commit: 338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
https://github.com/Dolibarr/dolibarr/commit/338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
Log Message:
-----------
Fix: Bad unique key
Commit: 14ec2cd1d95862cd533870059876950ba0081a1f
https://github.com/Dolibarr/dolibarr/commit/14ec2cd1d95862cd533870059876950ba0081a1f
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #1851 from grandoc/3.6
fix : missing translation
Commit: f1993e719fd0bd2aa08e760b939c8225d13d59cb
https://github.com/Dolibarr/dolibarr/commit/f1993e719fd0bd2aa08e760b939c8225d13d59cb
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
M htdocs/install/mysql/tables/llx_c_type_resource.sql
Log Message:
-----------
Merge pull request #1846 from aspangaro/3.6
Fix :: llx_c_type_resource when you update from a 3.6-beta
Commit: 3064aa21776a262da0cdbe051825b1eed0bc1f09
https://github.com/Dolibarr/dolibarr/commit/3064aa21776a262da0cdbe051825b1eed0bc1f09
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
M htdocs/install/mysql/tables/llx_c_type_resource.sql
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
M htdocs/product/document.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Conflicts:
htdocs/install/mysql/tables/llx_c_type_resource.key.sql
Commit: 79b081a7b74572913b70c47925ecc88af3482db7
https://github.com/Dolibarr/dolibarr/commit/79b081a7b74572913b70c47925ecc88af3482db7
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #1845 from Cubexed/patch-1
Fix unable to delete order line
Commit: d3a3e8786ec5b7c2665bb828f74902874c5d290d
https://github.com/Dolibarr/dolibarr/commit/d3a3e8786ec5b7c2665bb828f74902874c5d290d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/compta/salaries/index.php
Log Message:
-----------
Fix: sql request with pgsql
Commit: 1505ade3db5d8309813a5e9800b7680c076cd944
https://github.com/Dolibarr/dolibarr/commit/1505ade3db5d8309813a5e9800b7680c076cd944
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix error management: When an error is returned by hooks into
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.
Conflicts:
htdocs/core/lib/files.lib.php
Commit: 0e1f22fe26173cefb9f376f5d9ac3228adae754e
https://github.com/Dolibarr/dolibarr/commit/0e1f22fe26173cefb9f376f5d9ac3228adae754e
Author: Juanjo Menent <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
Log Message:
-----------
Fix: Salary payments are not reflected on the reporting sheets
Commit: 714da050346bdd0415e5c6b8c9e282d3d27882e9
https://github.com/Dolibarr/dolibarr/commit/714da050346bdd0415e5c6b8c9e282d3d27882e9
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix: another strict mode alert
Commit: 2c46c20dfb6dac5b65071cf10e71380c0f36630b
https://github.com/Dolibarr/dolibarr/commit/2c46c20dfb6dac5b65071cf10e71380c0f36630b
Author: Regis Houssin <address@hidden>
Date: 2014-08-28 (Thu, 28 Aug 2014)
Changed paths:
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix: php strict mode saga
Commit: a518a7256ce8729748dc74c40e46722caa846bdb
https://github.com/Dolibarr/dolibarr/commit/a518a7256ce8729748dc74c40e46722caa846bdb
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-29 (Fri, 29 Aug 2014)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
Log Message:
-----------
maj copyright
Commit: 47fc72a0012f63e53082bebda097d6d7dfe7d20c
https://github.com/Dolibarr/dolibarr/commit/47fc72a0012f63e53082bebda097d6d7dfe7d20c
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-29 (Fri, 29 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 47339d0e6202762b987f82c9d6f788eaef5405bd
https://github.com/Dolibarr/dolibarr/commit/47339d0e6202762b987f82c9d6f788eaef5405bd
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-29 (Fri, 29 Aug 2014)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
M htdocs/exports/export.php
M htdocs/langs/en_US/exports.lang
Log Message:
-----------
Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.
Commit: f64cb085a76fc2b1e4c7680a46ef1c2ceb2336e0
https://github.com/Dolibarr/dolibarr/commit/f64cb085a76fc2b1e4c7680a46ef1c2ceb2336e0
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-30 (Sat, 30 Aug 2014)
Changed paths:
M build/debian/dolibarr.postinst
M build/exe/doliwamp/doliwamp.iss
M htdocs/cashdesk/affContenu.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/includes/ckeditor/contents.css
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/langs/en_US/products.lang
M htdocs/product/class/product.class.php
M htdocs/product/document.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/5dc35ec13769...f64cb085a76f