[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 42c97c: Fix #6610
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 42c97c: Fix #6610 |
|
Date: |
Tue, 18 Dec 2018 12:56:14 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 42c97cf7d54b5953987c489b2b48dcaed470fdb6
https://github.com/Dolibarr/dolibarr/commit/42c97cf7d54b5953987c489b2b48dcaed470fdb6
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-12-02 (Sun, 02 Dec 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix #6610
Commit: 8fea6338e1b5ba078e64c005ec724228ac54c68c
https://github.com/Dolibarr/dolibarr/commit/8fea6338e1b5ba078e64c005ec724228ac54c68c
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-12-02 (Sun, 02 Dec 2018)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Fix #6565
Fix pdf footer height for all documents
Commit: 6d57c1b5f974b33ca5f04e37523ce5d270a3fc1f
https://github.com/Dolibarr/dolibarr/commit/6d57c1b5f974b33ca5f04e37523ce5d270a3fc1f
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-04 (Tue, 04 Dec 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #10165 from atm-maxime/fix_user_noperm
Fix #6610
Commit: b67ed871036ad534526c7726b4d35f5d7fbbd117
https://github.com/Dolibarr/dolibarr/commit/b67ed871036ad534526c7726b4d35f5d7fbbd117
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-04 (Tue, 04 Dec 2018)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge pull request #10166 from atm-maxime/fix_pdf_footer
Fix pdf footer height for all documents
Commit: 50da3c2ed2d6cbe7c02cededc9b6cca94811953c
https://github.com/Dolibarr/dolibarr/commit/50da3c2ed2d6cbe7c02cededc9b6cca94811953c
Author: Alexandre SPANGARO <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix: Problem with loan integration in general ledger
Commit: df8aaf9c06526ce955455eda7b9720e65bb980ac
https://github.com/Dolibarr/dolibarr/commit/df8aaf9c06526ce955455eda7b9720e65bb980ac
Author: Alexandre SPANGARO <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
A htdocs/compta/cashcontrol/cashcontrol_card.php
A htdocs/compta/cashcontrol/cashcontrol_list.php
A htdocs/compta/cashcontrol/class/cashcontrol.class.php
A htdocs/compta/cashcontrol/report.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modECM.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modTicket.class.php
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
A htdocs/install/mysql/tables/llx_pos_cash_fence.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/public/members/new.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '9.0' of https://github.com/Dolibarr/dolibarr into 9.0
Commit: 8148ea83614a8a15d8f60912acd0f1396f0f2d8c
https://github.com/Dolibarr/dolibarr/commit/8148ea83614a8a15d8f60912acd0f1396f0f2d8c
Author: Alexandre SPANGARO <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Revert "Fix: Problem with loan integration in general ledger"
This reverts commit 50da3c2ed2d6cbe7c02cededc9b6cca94811953c.
Commit: 6eb901343026c6ab58c532cb5e2f49a11b069bf8
https://github.com/Dolibarr/dolibarr/commit/6eb901343026c6ab58c532cb5e2f49a11b069bf8
Author: Alexandre SPANGARO <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix: Accountancy - remove alert on bank account configuration when bank
account is closed
Commit: 6ce0d3e279db42636e230ea93316f7fde20e0a30
https://github.com/Dolibarr/dolibarr/commit/6ce0d3e279db42636e230ea93316f7fde20e0a30
Author: Juanjo Menent <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
Log Message:
-----------
FIX: Vendor translations are in english
Commit: 9558020ea334866088758ac119e31c337bea3676
https://github.com/Dolibarr/dolibarr/commit/9558020ea334866088758ac119e31c337bea3676
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
Log Message:
-----------
Merge pull request #10233 from simnandez/8.0
FIX: Vendor translations are in english
Commit: 6275355cd52f43e121b0f664e0b7ef0b02313f04
https://github.com/Dolibarr/dolibarr/commit/6275355cd52f43e121b0f664e0b7ef0b02313f04
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Merge pull request #10234 from aspangaro/7.0_alert_bank
Fix: Accountancy - remove alert on bank account configuration when bank account
is closed
Commit: 9b844df3154e19c6eb9bc4d3f07c6600fdfd4d35
https://github.com/Dolibarr/dolibarr/commit/9b844df3154e19c6eb9bc4d3f07c6600fdfd4d35
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
FIX Extrafields on shipment module
Commit: 2d05b7c7904c69a0fb51e6cb8319b17f0ab89c3a
https://github.com/Dolibarr/dolibarr/commit/2d05b7c7904c69a0fb51e6cb8319b17f0ab89c3a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 20d24f2febeff6ce01eefd6c91d5776d2d9f225f
https://github.com/Dolibarr/dolibarr/commit/20d24f2febeff6ce01eefd6c91d5776d2d9f225f
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 003c463ee452ac46f6a3f12251e925a07f9bebe7
https://github.com/Dolibarr/dolibarr/commit/003c463ee452ac46f6a3f12251e925a07f9bebe7
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/product/stock/class/productstockentrepot.class.php
Log Message:
-----------
FIX Can't delete a line of minimal stock per warehouse
Commit: efb88292dda9b1632a9af18977cfc586cb5ac66d
https://github.com/Dolibarr/dolibarr/commit/efb88292dda9b1632a9af18977cfc586cb5ac66d
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Clean code
Commit: d8b5cd4bdfe13c4094bcd3271fb994bc70223ca3
https://github.com/Dolibarr/dolibarr/commit/d8b5cd4bdfe13c4094bcd3271fb994bc70223ca3
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Remove white lines
Commit: af4405c669043f6a5f3845731fde6aa1ad241eb3
https://github.com/Dolibarr/dolibarr/commit/af4405c669043f6a5f3845731fde6aa1ad241eb3
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-16 (Sun, 16 Dec 2018)
Changed paths:
M htdocs/langs/en_US/stocks.lang
M htdocs/product/stock/replenish.php
Log Message:
-----------
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
Commit: f728b28a67ba25b480f05ad7a214d80959828369
https://github.com/Dolibarr/dolibarr/commit/f728b28a67ba25b480f05ad7a214d80959828369
Author: Alexandre SPANGARO <address@hidden>
Date: 2018-12-17 (Mon, 17 Dec 2018)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
FIX: Missing information on Agiris Export
Commit: 1aadcc50f11ae2174264c2a69c604bfdaf4f9b12
https://github.com/Dolibarr/dolibarr/commit/1aadcc50f11ae2174264c2a69c604bfdaf4f9b12
Author: atm-ph <address@hidden>
Date: 2018-12-17 (Mon, 17 Dec 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix attached files from user mail form don't work
Commit: 48162db33d90d31c080e26c7bdfa9412f43c8376
https://github.com/Dolibarr/dolibarr/commit/48162db33d90d31c080e26c7bdfa9412f43c8376
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-17 (Mon, 17 Dec 2018)
Changed paths:
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
FIX Rename of image file lose the thumbs
Commit: 4a22640ae94b02925e1e256e25138037d22763b9
https://github.com/Dolibarr/dolibarr/commit/4a22640ae94b02925e1e256e25138037d22763b9
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-17 (Mon, 17 Dec 2018)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Merge pull request #10240 from aspangaro/9.0_agiris
FIX: Accountancy - Missing information on Agiris Export
Commit: 051853fc00b663047293aa914e4c22458c6cde36
https://github.com/Dolibarr/dolibarr/commit/051853fc00b663047293aa914e4c22458c6cde36
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-17 (Mon, 17 Dec 2018)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #10246 from atm-ph/fix_7.0_user_attached_files
Fix attached files from user mail form don't work
Commit: 3ae03d619d16632a5d76d712b80f9c9c2cdb4759
https://github.com/Dolibarr/dolibarr/commit/3ae03d619d16632a5d76d712b80f9c9c2cdb4759
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/website/index.php
Log Message:
-----------
Fix tooltip
Commit: dcdfe5c318b9483bb4f66e854d967918f91a076d
https://github.com/Dolibarr/dolibarr/commit/dcdfe5c318b9483bb4f66e854d967918f91a076d
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 16496218d39e762981ac97030d81fed18d601a90
https://github.com/Dolibarr/dolibarr/commit/16496218d39e762981ac97030d81fed18d601a90
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/img/menus/ticket.png
M htdocs/theme/md/img/object_ticket.png
M htdocs/theme/md/style.css.php
Log Message:
-----------
css
Commit: c3eb13105409ac05b7e19684dac26e5b736781b1
https://github.com/Dolibarr/dolibarr/commit/c3eb13105409ac05b7e19684dac26e5b736781b1
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/langs/en_US/agenda.lang
Log Message:
-----------
Debug ticket module
Commit: 57c41bac5660a613d72b430d82be25b120bbd3cd
https://github.com/Dolibarr/dolibarr/commit/57c41bac5660a613d72b430d82be25b120bbd3cd
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/js/lib_foot.js.php
M htdocs/core/js/lib_gravatar.js.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/js/lib_notification.js.php
M htdocs/core/js/timepicker.js.php
M htdocs/modulebuilder/template/css/mymodule.css.php
M htdocs/public/ticket/index.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/ticket/css/styles.css.php
Log Message:
-----------
Fix parameter session_cache_limiter
Commit: 90e87fc4d9bcf56b8bf4c931e2ecb1da9a1de4cc
https://github.com/Dolibarr/dolibarr/commit/90e87fc4d9bcf56b8bf4c931e2ecb1da9a1de4cc
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix cache
Commit: 2d2b95a0829ad4ab765d775eb4a6c1df9983fca9
https://github.com/Dolibarr/dolibarr/commit/2d2b95a0829ad4ab765d775eb4a6c1df9983fca9
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix calculation of top menu entry of user
Commit: 2e6a41228f799a61d6a0fb1f0e4db37e71b88b65
https://github.com/Dolibarr/dolibarr/commit/2e6a41228f799a61d6a0fb1f0e4db37e71b88b65
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/modules/modAccounting.class.php
Log Message:
-----------
Fix removing constant no more required
Commit: 31d032d5d36c74f1d3a6653832b75dd0cac1b5ea
https://github.com/Dolibarr/dolibarr/commit/31d032d5d36c74f1d3a6653832b75dd0cac1b5ea
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/adherents/subscription.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX Can't create a thirdparty from member if customer code is mandatory.
Commit: f2318716ecc06cb9641f022981d960d6881a90af
https://github.com/Dolibarr/dolibarr/commit/f2318716ecc06cb9641f022981d960d6881a90af
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX Error reported when creation of thirdparty from member fails
Commit: 6851232314effbe5cbd3cf44e211547e7e7a26b1
https://github.com/Dolibarr/dolibarr/commit/6851232314effbe5cbd3cf44e211547e7e7a26b1
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/modules/modAccounting.class.php
Log Message:
-----------
Fix removing constant no more required
Commit: b8429c607ed6a66bf42be81189a07ffac4766994
https://github.com/Dolibarr/dolibarr/commit/b8429c607ed6a66bf42be81189a07ffac4766994
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/adherents/subscription.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX Can't create a thirdparty from member if customer code is mandatory.
Commit: 4b6ae9d42402844f8b37fc2a9ef7e0a63d1cedcf
https://github.com/Dolibarr/dolibarr/commit/4b6ae9d42402844f8b37fc2a9ef7e0a63d1cedcf
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX Error reported when creation of thirdparty from member fails
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
Commit: fb8c3f01a4d73504e0adc8118acabeeaf95e9a37
https://github.com/Dolibarr/dolibarr/commit/fb8c3f01a4d73504e0adc8118acabeeaf95e9a37
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
Commit: 4b7f373802061c95de5461b2acf6da5260212dcf
https://github.com/Dolibarr/dolibarr/commit/4b7f373802061c95de5461b2acf6da5260212dcf
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 89068ffef11c762277993e69cab93a3b410bb86a
https://github.com/Dolibarr/dolibarr/commit/89068ffef11c762277993e69cab93a3b410bb86a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/societe/class/societe.class.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
Commit: 44a66449699ab48ddd4caa75c30422197c11824a
https://github.com/Dolibarr/dolibarr/commit/44a66449699ab48ddd4caa75c30422197c11824a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-18 (Tue, 18 Dec 2018)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/subscription.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/js/lib_foot.js.php
M htdocs/core/js/lib_gravatar.js.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/js/lib_notification.js.php
M htdocs/core/js/timepicker.js.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.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/livraison/doc/pdf_typhon.modules.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/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/workflow.lang
M htdocs/modulebuilder/template/css/mymodule.css.php
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/public/ticket/index.php
M htdocs/societe/class/societe.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/img/menus/ticket.png
M htdocs/theme/md/img/object_ticket.png
M htdocs/theme/md/style.css.php
M htdocs/ticket/css/styles.css.php
M htdocs/user/card.php
M htdocs/website/index.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/65412b77de99...44a66449699a
**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.