[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1daba5: Fix count(): Parameter must b
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1daba5: Fix count(): Parameter must be an array or an obje... |
Date: |
Tue, 24 Jul 2018 10:37:20 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1daba56bbc665f666bad0af7a56dca80cfd68fc8
https://github.com/Dolibarr/dolibarr/commit/1daba56bbc665f666bad0af7a56dca80cfd68fc8
Author: John BOTELLA <address@hidden>
Date: 2018-07-09 (Mon, 09 Jul 2018)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
Fix count(): Parameter must be an array or an object that implements Countable
Commit: 2f668ccc79f36cb3612b131d6d1176274fc4b5ca
https://github.com/Dolibarr/dolibarr/commit/2f668ccc79f36cb3612b131d6d1176274fc4b5ca
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-09 (Mon, 09 Jul 2018)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
Merge pull request #9076 from atm-john/fix_count_parameter_6.0
Fix count(): Parameter must be an array or an object that implements …
Commit: 170a668b2bdf15f232c60a1d3c3f6a01a1236e32
https://github.com/Dolibarr/dolibarr/commit/170a668b2bdf15f232c60a1d3c3f6a01a1236e32
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-13 (Fri, 13 Jul 2018)
Changed paths:
M htdocs/core/tpl/card_presend.tpl.php
Log Message:
-----------
FIX : Set contactCivName substitution key
Commit: de8fd3d12c75ed44889c5656fd00a4b365de6691
https://github.com/Dolibarr/dolibarr/commit/de8fd3d12c75ed44889c5656fd00a4b365de6691
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/core/tpl/card_presend.tpl.php
Log Message:
-----------
NEW : Contact substitutions keys
Commit: 9d60b0a8c656005e4dfe7f84d9f9b1cdcdefe112
https://github.com/Dolibarr/dolibarr/commit/9d60b0a8c656005e4dfe7f84d9f9b1cdcdefe112
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M htdocs/resource/list.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0
Commit: 3c5998e697f214224da97fb9b2a63d883c4d303c
https://github.com/Dolibarr/dolibarr/commit/3c5998e697f214224da97fb9b2a63d883c4d303c
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/core/tpl/card_presend.tpl.php
Log Message:
-----------
FIX : Refactoring
Commit: 33aa37336277645259f134b3eae1b62464e67b78
https://github.com/Dolibarr/dolibarr/commit/33aa37336277645259f134b3eae1b62464e67b78
Author: gauthier <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
FIX: when stock is empty for current entity but > 0 in other entity, until
this commit product wasn't displaied on replenishment, it must depends on
multientity stock sharing
Commit: b306394c15b1871235702254c544d4f17c3097f2
https://github.com/Dolibarr/dolibarr/commit/b306394c15b1871235702254c544d4f17c3097f2
Author: Chl <address@hidden>
Date: 2018-07-17 (Tue, 17 Jul 2018)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
corr. group by pour PostgreSQL
Commit: 1e986bc39a54f73d336ff8e5da0e98e13905690c
https://github.com/Dolibarr/dolibarr/commit/1e986bc39a54f73d336ff8e5da0e98e13905690c
Author: John BOTELLA <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this
will throw an Error in a future version of PHP)
Commit: 0c01f6e1395b4926817a0bb0e70422a1ead5da3f
https://github.com/Dolibarr/dolibarr/commit/0c01f6e1395b4926817a0bb0e70422a1ead5da3f
Author: John BOTELLA <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Fix situation invoice status
Commit: 984a8e3720884511ada2a9c0b78bc5bd1be5a1eb
https://github.com/Dolibarr/dolibarr/commit/984a8e3720884511ada2a9c0b78bc5bd1be5a1eb
Author: Regis Houssin <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
FIX disable/enable foreign key checking for avoid errors
Commit: e9d9954380adff4258ae9fa7551b7880a062e92a
https://github.com/Dolibarr/dolibarr/commit/e9d9954380adff4258ae9fa7551b7880a062e92a
Author: Regis Houssin <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
FIX do not convert llx_const if mysql encrypt/decrypt is used
Commit: 719db2574e98f29b9255b6143175dba44c1ae3ee
https://github.com/Dolibarr/dolibarr/commit/719db2574e98f29b9255b6143175dba44c1ae3ee
Author: Regis Houssin <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
FIX check if "confirmed" mode
Commit: 5cdc9db1f8a29b9466a6f2f5f807d74229ad9c8e
https://github.com/Dolibarr/dolibarr/commit/5cdc9db1f8a29b9466a6f2f5f807d74229ad9c8e
Author: Regis Houssin <address@hidden>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
FIX add html comment
Commit: c4e207e8b7775097dbc641370fc618bdac98203c
https://github.com/Dolibarr/dolibarr/commit/c4e207e8b7775097dbc641370fc618bdac98203c
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-22 (Sun, 22 Jul 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix dol_string_onlythesehtmltags
Commit: d582f72bd95fd290b2ab1efa8fb0b29b74d003d4
https://github.com/Dolibarr/dolibarr/commit/d582f72bd95fd290b2ab1efa8fb0b29b74d003d4
Author: Frédéric FRANCE <address@hidden>
Date: 2018-07-22 (Sun, 22 Jul 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
Commit: 4341e367d26e5136b05128a8e95e3a32a5025a69
https://github.com/Dolibarr/dolibarr/commit/4341e367d26e5136b05128a8e95e3a32a5025a69
Author: Frédéric FRANCE <address@hidden>
Date: 2018-07-23 (Mon, 23 Jul 2018)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
remove % in supplier order pdf
Commit: df7a3598a8ad9cbba40c766d71a8b72c4869c012
https://github.com/Dolibarr/dolibarr/commit/df7a3598a8ad9cbba40c766d71a8b72c4869c012
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-23 (Mon, 23 Jul 2018)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Trans
Commit: 18125d56e5644e61fc0a2286b89277c961ee6ba5
https://github.com/Dolibarr/dolibarr/commit/18125d56e5644e61fc0a2286b89277c961ee6ba5
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-23 (Mon, 23 Jul 2018)
Changed paths:
M htdocs/theme/md/style.css.php
Log Message:
-----------
css
Commit: 4995a0feb116c94bd34e0142cf31db9fb24774c5
https://github.com/Dolibarr/dolibarr/commit/4995a0feb116c94bd34e0142cf31db9fb24774c5
Author: Chl <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Translation: adding 'Enable' term in main
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.
Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
Commit: 0f115dafee2a75cc7000c57265493d15c9038199
https://github.com/Dolibarr/dolibarr/commit/0f115dafee2a75cc7000c57265493d15c9038199
Author: Chl <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
2 bugfix for PDF generated by Templates/Cron: DueDate and translation
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
Commit: ccd733264742014e594c2e58ada979eb0846dde0
https://github.com/Dolibarr/dolibarr/commit/ccd733264742014e594c2e58ada979eb0846dde0
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/admin/mails_templates.php
Log Message:
-----------
Fix default value of joinfile when creating a new email template
Commit: 25c93de80149135fe995c59b02f283c9cfde2e93
https://github.com/Dolibarr/dolibarr/commit/25c93de80149135fe995c59b02f283c9cfde2e93
Author: Regis Houssin <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
Log Message:
-----------
FIX missing drop old postgresql unique key
Commit: 20a1ffe8102dd169b616913cc4ed082bc8c6766d
https://github.com/Dolibarr/dolibarr/commit/20a1ffe8102dd169b616913cc4ed082bc8c6766d
Author: Regis Houssin <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX field is autoincrement but not "rowid"
Commit: e4705669ba8ad07b13a31a74874136c5592ebe7b
https://github.com/Dolibarr/dolibarr/commit/e4705669ba8ad07b13a31a74874136c5592ebe7b
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #9136 from frederic34/patch-17
remove % in supplier order pdf
Commit: 8866b8eb1d5ab04d727c184b79095d52499aa75f
https://github.com/Dolibarr/dolibarr/commit/8866b8eb1d5ab04d727c184b79095d52499aa75f
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #9133 from frederic34/patch-12
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
Commit: a65c4ebecdaf541c666c175f267d532da52af7b7
https://github.com/Dolibarr/dolibarr/commit/a65c4ebecdaf541c666c175f267d532da52af7b7
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/install/repair.php
Log Message:
-----------
Merge pull request #9130 from hregis/8.0_bug
FIX disable/enable foreign key checking for avoid errors
Commit: 3bdf7d411d0cd068ca6da70493b249316166a507
https://github.com/Dolibarr/dolibarr/commit/3bdf7d411d0cd068ca6da70493b249316166a507
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #9125 from atm-john/fix_php7_warning_mysql
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
Commit: bde30b85ad7a493d9421379dfff3c467b7ac48e0
https://github.com/Dolibarr/dolibarr/commit/bde30b85ad7a493d9421379dfff3c467b7ac48e0
Author: Frédéric FRANCE <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
use defaut currency for supplier order
Commit: 438cdfc004da9c572d4dd43b7425c154bb00f76a
https://github.com/Dolibarr/dolibarr/commit/438cdfc004da9c572d4dd43b7425c154bb00f76a
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/user/class/api_users.class.php
Log Message:
-----------
FIX #9141
Commit: 68ad5d780c4f07741574bf0c03cca86915729b7c
https://github.com/Dolibarr/dolibarr/commit/68ad5d780c4f07741574bf0c03cca86915729b7c
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
Log Message:
-----------
Merge pull request #9142 from hregis/8.0_pg
FIX missing drop old postgresql unique key
Commit: 71deb9ea60bd8901f657d8ed16cd97e7f0347bdb
https://github.com/Dolibarr/dolibarr/commit/71deb9ea60bd8901f657d8ed16cd97e7f0347bdb
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #9143 from hregis/8.0_dict
FIX field is autoincrement but not "rowid"
Commit: c7f54439ff7da93f91e2e083d0d87a9ce1e1a5f9
https://github.com/Dolibarr/dolibarr/commit/c7f54439ff7da93f91e2e083d0d87a9ce1e1a5f9
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/fourn/commande/card.php
Log Message:
-----------
Merge pull request #9145 from frederic34/patch-12
use defaut currency for supplier order
Commit: 08a5b499fe15799d25f099141e39c7f47c3d6ac5
https://github.com/Dolibarr/dolibarr/commit/08a5b499fe15799d25f099141e39c7f47c3d6ac5
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge pull request #9139 from bugness-chl/8.0-translation
Translation: adding 'Enable' term in main
Commit: bb9c53b41f64ac90f00a9899026991921e018865
https://github.com/Dolibarr/dolibarr/commit/bb9c53b41f64ac90f00a9899026991921e018865
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #9118 from bugness-chl/8.0
corr. "group by" for PostgreSQL
Commit: a469f841f76e601468e2e38fb9a96af5fa72553e
https://github.com/Dolibarr/dolibarr/commit/a469f841f76e601468e2e38fb9a96af5fa72553e
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
Commit: 869a97c8d1942a8b570db4225e881af6fc2f96e3
https://github.com/Dolibarr/dolibarr/commit/869a97c8d1942a8b570db4225e881af6fc2f96e3
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Update card.php
Commit: ece655a84af98895b3f4e834e0025b8cd81768d3
https://github.com/Dolibarr/dolibarr/commit/ece655a84af98895b3f4e834e0025b8cd81768d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge pull request #9128 from atm-john/fix_situation_invoice_status
Fix situation invoice status
Commit: 77c121b15cefc76722e8ddc63460fb3aa6ffe202
https://github.com/Dolibarr/dolibarr/commit/77c121b15cefc76722e8ddc63460fb3aa6ffe202
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/core/tpl/card_presend.tpl.php
Log Message:
-----------
Merge pull request #9099 from ATM-Nicolas/7.0
NEW Set contactCivName substitution key
Commit: e9eb8da61b12d995f1091c5678429ae9855c873d
https://github.com/Dolibarr/dolibarr/commit/e9eb8da61b12d995f1091c5678429ae9855c873d
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Update replenish.php
Commit: f50aa0318736d3f504f3e33794798a030c3ac5dd
https://github.com/Dolibarr/dolibarr/commit/f50aa0318736d3f504f3e33794798a030c3ac5dd
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish
FIX: stock replenish with multientity
Commit: f672e8bf02ec73667b19033a068cf87b3bec9ed6
https://github.com/Dolibarr/dolibarr/commit/f672e8bf02ec73667b19033a068cf87b3bec9ed6
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/societe/paymentmodes.php
Log Message:
-----------
Fix trans
Commit: 20f178fdfe47ca4f2aee4eb338b25d6c5d4f0cf4
https://github.com/Dolibarr/dolibarr/commit/20f178fdfe47ca4f2aee4eb338b25d6c5d4f0cf4
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
Commit: 927727edf38016a4e77119483661ada06553fe81
https://github.com/Dolibarr/dolibarr/commit/927727edf38016a4e77119483661ada06553fe81
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: d871b8964f08a8d39614f9fd1a9be0701acb89bd
https://github.com/Dolibarr/dolibarr/commit/d871b8964f08a8d39614f9fd1a9be0701acb89bd
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 7821e21e5bebf5c2413ea3834f977cf688c1b41d
https://github.com/Dolibarr/dolibarr/commit/7821e21e5bebf5c2413ea3834f977cf688c1b41d
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/index.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/repair.php
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: dc2fec8f57fb2f7bddaa938bb5464a7df1784955
https://github.com/Dolibarr/dolibarr/commit/dc2fec8f57fb2f7bddaa938bb5464a7df1784955
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-24 (Tue, 24 Jul 2018)
Changed paths:
M htdocs/admin/dict.php
M htdocs/admin/mails_templates.php
M htdocs/comm/action/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/repair.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/product/stock/replenish.php
M htdocs/societe/paymentmodes.php
M htdocs/theme/md/style.css.php
M htdocs/user/class/api_users.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b992c4b2600a...dc2fec8f57fb
**NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.