[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 196156: fix setEventMessages error in
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 196156: fix setEventMessages error insteads of errors |
|
Date: |
Thu, 27 Apr 2017 08:21:05 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 196156a21eb0974a9459fe45a4599cc0b4952b2a
https://github.com/Dolibarr/dolibarr/commit/196156a21eb0974a9459fe45a4599cc0b4952b2a
Author: florian HENRY <address@hidden>
Date: 2017-04-13 (Thu, 13 Apr 2017)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
fix setEventMessages error insteads of errors
Commit: 8b0c123acab802c059d75ce294eaf5ae58b3e72d
https://github.com/Dolibarr/dolibarr/commit/8b0c123acab802c059d75ce294eaf5ae58b3e72d
Author: florian HENRY <address@hidden>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M build/debian/control
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0
Commit: 24962863744aad5a3062c8690ec6206d469b24d9
https://github.com/Dolibarr/dolibarr/commit/24962863744aad5a3062c8690ec6206d469b24d9
Author: florian HENRY <address@hidden>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
Commit: 6c5b329dd17bbb69c3089d017d72b6ee6354e948
https://github.com/Dolibarr/dolibarr/commit/6c5b329dd17bbb69c3089d017d72b6ee6354e948
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M htdocs/fourn/paiement/card.php
Log Message:
-----------
Fix : display bank on supplier payment as on customer payment
Commit: 402924f6d7b6d073957e06321bc49e83638f2d5d
https://github.com/Dolibarr/dolibarr/commit/402924f6d7b6d073957e06321bc49e83638f2d5d
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-04-14 (Fri, 14 Apr 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix : no origin on stock mvmt when order set back to draft
Commit: 006ad4cef82264d5d1044709dbc058c9a3cdc20f
https://github.com/Dolibarr/dolibarr/commit/006ad4cef82264d5d1044709dbc058c9a3cdc20f
Author: Juanjo Menent <address@hidden>
Date: 2017-04-15 (Sat, 15 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
Commit: 00390bc8e42a40fb5f7462042c69a48d6f0856fb
https://github.com/Dolibarr/dolibarr/commit/00390bc8e42a40fb5f7462042c69a48d6f0856fb
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #6705 from atm-florian/5.0
fix setEventMessages error insteads of errors
Commit: 2fb96c8817cab89cae2c614902e25b555e858dff
https://github.com/Dolibarr/dolibarr/commit/2fb96c8817cab89cae2c614902e25b555e858dff
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge pull request #6708 from atm-florian/5.0_fixmissingaccountancy_mainmenu
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
Commit: 2413c728a861e3b0e8a1a0be3ac99806e285073f
https://github.com/Dolibarr/dolibarr/commit/2413c728a861e3b0e8a1a0be3ac99806e285073f
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/fourn/paiement/card.php
Log Message:
-----------
Merge pull request #6710 from atm-maxime/fix_bank_on_supp_pay
Fix : display bank on supplier payment as on customer payment
Commit: f059ab004207c877a36c15a32ec0202347aa60f2
https://github.com/Dolibarr/dolibarr/commit/f059ab004207c877a36c15a32ec0202347aa60f2
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #6711 from atm-maxime/fix_stockmvt_origin
Fix : no origin on stock mvmt when order set back to draft
Commit: f000ca23c35510371ed69e7b6d102bd1874b1054
https://github.com/Dolibarr/dolibarr/commit/f000ca23c35510371ed69e7b6d102bd1874b1054
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge pull request #6721 from simnandez/5.0
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
Commit: e1ea6e2b534fd8d634aec9ece49ff2738140ebcb
https://github.com/Dolibarr/dolibarr/commit/e1ea6e2b534fd8d634aec9ece49ff2738140ebcb
Author: rassakali <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/adherents/subscription/card.php
Log Message:
-----------
Update card.php
Commit: 1fd359d52da4f721ad01be1493b9db17455ca79f
https://github.com/Dolibarr/dolibarr/commit/1fd359d52da4f721ad01be1493b9db17455ca79f
Author: Juanjo Menent <address@hidden>
Date: 2017-04-16 (Sun, 16 Apr 2017)
Changed paths:
M htdocs/adherents/subscription/card.php
Log Message:
-----------
Merge pull request #6723 from rassakali/patch-3
Update /adherents/subscription/card.php
Commit: 82f9555c6b96fe4298064e1d2584a2c688f6586a
https://github.com/Dolibarr/dolibarr/commit/82f9555c6b96fe4298064e1d2584a2c688f6586a
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths:
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Translation
Commit: 9456f7091e3dbaaada79cf274b0467af34f0bc76
https://github.com/Dolibarr/dolibarr/commit/9456f7091e3dbaaada79cf274b0467af34f0bc76
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths:
M build/debian/control
M htdocs/adherents/subscription/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/paiement/card.php
M htdocs/install/repair.php
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: d89a89f8ea5730171c1b84ff3b369d0d44c9ec43
https://github.com/Dolibarr/dolibarr/commit/d89a89f8ea5730171c1b84ff3b369d0d44c9ec43
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Fix error message
Commit: cfc31e91e87064cf73931e18e3ff496da7a2ce27
https://github.com/Dolibarr/dolibarr/commit/cfc31e91e87064cf73931e18e3ff496da7a2ce27
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-18 (Tue, 18 Apr 2017)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
FIX overwrapping of weight/volume on rouget template
Commit: 0080821dc5b4a3c40f7f5ddf5b8cd12f267c4983
https://github.com/Dolibarr/dolibarr/commit/0080821dc5b4a3c40f7f5ddf5b8cd12f267c4983
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-23 (Sun, 23 Apr 2017)
Changed paths:
M htdocs/comm/card.php
Log Message:
-----------
Fix no invoice if not a customer
Commit: ec59f08e419dc3c81df14ffcd5a71f231331b9ba
https://github.com/Dolibarr/dolibarr/commit/ec59f08e419dc3c81df14ffcd5a71f231331b9ba
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
FIX extrafield css for boolean type
Commit: af56c85057c9201f7a6a10abf9f400a36b4aca6a
https://github.com/Dolibarr/dolibarr/commit/af56c85057c9201f7a6a10abf9f400a36b4aca6a
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
Log Message:
-----------
Fix perms on file
Commit: 65fec95458f17fdd87673fb737fabd2f04b4e5f0
https://github.com/Dolibarr/dolibarr/commit/65fec95458f17fdd87673fb737fabd2f04b4e5f0
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-24 (Mon, 24 Apr 2017)
Changed paths:
M build/debian/dolibarr.postinst
M build/debian/install.forced.php.install
M build/makepack-dolibarr.pl
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/install/fileconf.php
Log Message:
-----------
Fix debian package
Commit: 113d4d1665dd76ab40d0aed3870af2c4d853eab8
https://github.com/Dolibarr/dolibarr/commit/113d4d1665dd76ab40d0aed3870af2c4d853eab8
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-25 (Tue, 25 Apr 2017)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX spaces not allowed into vat code
Commit: 95788c96994980b12bf13464795bb9b6fc1e294f
https://github.com/Dolibarr/dolibarr/commit/95788c96994980b12bf13464795bb9b6fc1e294f
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
FIX A non admin user can not download files attached to user.
Commit: d390acc8886a7f48899e5bf180b1d4f42d9c45c5
https://github.com/Dolibarr/dolibarr/commit/d390acc8886a7f48899e5bf180b1d4f42d9c45c5
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
FIX A non admin user can not download files attached to user.
Commit: e97fae0c43f0cbfd0cc53dfdadd5e49ef0913835
https://github.com/Dolibarr/dolibarr/commit/e97fae0c43f0cbfd0cc53dfdadd5e49ef0913835
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix typo
Commit: 1a98c4a3ffcc8e7201c45ed3021f40c6ec71eb9a
https://github.com/Dolibarr/dolibarr/commit/1a98c4a3ffcc8e7201c45ed3021f40c6ec71eb9a
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/admin/translation.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
Log Message:
-----------
Fix error management in adding translation key
Commit: 9c2ce0202da0799a8994fef2921e0e887cd8cb82
https://github.com/Dolibarr/dolibarr/commit/9c2ce0202da0799a8994fef2921e0e887cd8cb82
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Translation
Commit: 5e856e692369eaf33c5ffa327b63a70792357397
https://github.com/Dolibarr/dolibarr/commit/5e856e692369eaf33c5ffa327b63a70792357397
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M htdocs/admin/chequereceipts.php
M htdocs/admin/commande.php
M htdocs/admin/contract.php
M htdocs/admin/expedition.php
M htdocs/admin/expensereport.php
M htdocs/admin/facture.php
M htdocs/admin/fichinter.php
M htdocs/admin/livraison.php
M htdocs/admin/payment.php
M htdocs/admin/propal.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_proposal.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
M htdocs/fourn/card.php
M htdocs/langs/en_US/companies.lang
M htdocs/societe/agenda.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
More complete tooltip help to describe available substitution vars
Commit: cfde27820e73b6c7f51179cd319f6b1db2703a27
https://github.com/Dolibarr/dolibarr/commit/cfde27820e73b6c7f51179cd319f6b1db2703a27
Author: Laurent Destailleur <address@hidden>
Date: 2017-04-27 (Thu, 27 Apr 2017)
Changed paths:
M build/debian/install.forced.php.install
M build/makepack-dolibarr.pl
M htdocs/adherents/subscription/card.php
M htdocs/admin/dict.php
M htdocs/admin/translation.php
M htdocs/comm/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/card.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/fourn/paiement/card.php
M htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/2f23b36ca1b4...cfde27820e73