[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c78f14: Merge branch 'misc-texts' int
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c78f14: Merge branch 'misc-texts' into develop |
Date: |
Thu, 02 Aug 2018 09:38:47 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c78f14553327b784dabbe168fa66c2b3d738122c
https://github.com/Dolibarr/dolibarr/commit/c78f14553327b784dabbe168fa66c2b3d738122c
Author: Steve <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/categories.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/exports.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/opensurvey.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/sms.lang
M htdocs/langs/en_US/suppliers.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/en_US/withdrawals.lang
Log Message:
-----------
Merge branch 'misc-texts' into develop
Commit: f5889bb2c7ffae408a06c41784ba22f960975127
https://github.com/Dolibarr/dolibarr/commit/f5889bb2c7ffae408a06c41784ba22f960975127
Author: Steve <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: b5f17d225794c1a3c3b1473ccfab9b1edc132232
https://github.com/Dolibarr/dolibarr/commit/b5f17d225794c1a3c3b1473ccfab9b1edc132232
Author: Steve <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/core/class/notify.class.php
M htdocs/langs/en_US/exports.lang
M htdocs/product/stock/replenish.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 5738020883db8e933daa3579be1dfc355325863c
https://github.com/Dolibarr/dolibarr/commit/5738020883db8e933daa3579be1dfc355325863c
Author: Steve <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formticket.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
R htdocs/core/modules/modules_ticketsup.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
M htdocs/core/modules/product/doc/pdf_standard.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/modules/project/doc/pdf_timespent.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/stock/doc/pdf_standard.modules.php
M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/ticket/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 9d3a0442c0ef9c4e1d913d0cf98a1dcff7dd5e20
https://github.com/Dolibarr/dolibarr/commit/9d3a0442c0ef9c4e1d913d0cf98a1dcff7dd5e20
Author: Steve <address@hidden>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M htdocs/core/lib/bank.lib.php
Log Message:
-----------
dolibarr-develop, php 7.2.7
On third party, add bank account. After spanish account has been added, on
summary screen
..../htdocs/societe/paymentmodes.php
a correct account number causes the error:
Warning: A non-numeric value encountered in
.......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359
This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`
Since substr returns a string it cannot be summed (I assume).
I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
Commit: 0e3473701a0d5a0294c542a179277300fb656c13
https://github.com/Dolibarr/dolibarr/commit/0e3473701a0d5a0294c542a179277300fb656c13
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/core/lib/bank.lib.php
Log Message:
-----------
Update bank.lib.php
Commit: e106fda5e697bc62968ef6cac024073454d3571b
https://github.com/Dolibarr/dolibarr/commit/e106fda5e697bc62968ef6cac024073454d3571b
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/core/lib/bank.lib.php
Log Message:
-----------
Merge pull request #9113 from torvista/export-import
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
Compare:
https://github.com/Dolibarr/dolibarr/compare/fbc742c2c352...e106fda5e697
**NOTE:** This service has 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] c78f14: Merge branch 'misc-texts' into develop,
Laurent Destailleur <=