[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b6deda: FIX credit note used on list
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b6deda: FIX credit note used on list |
|
Date: |
Mon, 26 Aug 2019 07:49:31 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b6deda1111fd654086f6faf7d3dc6a0227e55b39
https://github.com/Dolibarr/dolibarr/commit/b6deda1111fd654086f6faf7d3dc6a0227e55b39
Author: atm-quentin <address@hidden>
Date: 2019-02-18 (Mon, 18 Feb 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/list.php
Log Message:
-----------
FIX credit note used on list
Commit: 57fff10766814602cecd18946452d683a1cb04a2
https://github.com/Dolibarr/dolibarr/commit/57fff10766814602cecd18946452d683a1cb04a2
Author: atm-quentin <address@hidden>
Date: 2019-02-22 (Fri, 22 Feb 2019)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/class/discount.class.php
Log Message:
-----------
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into
FIX_credit_note_used_on_list
Commit: 785092544115056183e718a831e3ac419c4b797e
https://github.com/Dolibarr/dolibarr/commit/785092544115056183e718a831e3ac419c4b797e
Author: atm-quentin <address@hidden>
Date: 2019-02-22 (Fri, 22 Feb 2019)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX amount opened on thirdparty card dont care of credit note not converted
Commit: dc7a2fbb30e34b04a5cc88af5ac6234c8be56911
https://github.com/Dolibarr/dolibarr/commit/dc7a2fbb30e34b04a5cc88af5ac6234c8be56911
Author: atm-quentin <address@hidden>
Date: 2019-02-25 (Mon, 25 Feb 2019)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX placement function
Commit: 7ae6472e36758a6292bb1ff9353f4aa73e653923
https://github.com/Dolibarr/dolibarr/commit/7ae6472e36758a6292bb1ff9353f4aa73e653923
Author: atm-quentin <address@hidden>
Date: 2019-04-12 (Fri, 12 Apr 2019)
Changed paths:
A dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/admin/agenda_reminder.php
M htdocs/comm/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/remise.php
M htdocs/commande/card.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/tva/clients.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/security.lib.php
M htdocs/core/login/functions_dolibarr.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/card.php
M htdocs/expedition/shipment.php
M htdocs/exports/export.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/rapport.php
M htdocs/hrm/index.php
M htdocs/livraison/card.php
M htdocs/margin/lib/margins.lib.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/stock/card.php
M htdocs/product/stock/replenish.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/list.php
M htdocs/societe/card.php
M htdocs/supplier_proposal/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/variants/combinations.php
Log Message:
-----------
Merge branch '8.0' of github.com:Dolibarr/dolibarr into
FIX_credit_note_used_on_list
Commit: 6deba39c6a9d67826297d7422f8130bb95133b35
https://github.com/Dolibarr/dolibarr/commit/6deba39c6a9d67826297d7422f8130bb95133b35
Author: atm-quentin <address@hidden>
Date: 2019-04-12 (Fri, 12 Apr 2019)
Changed paths:
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/facture/list.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
FIX credit note can be split
Commit: b8406f842d517962d0b5f16e93b4c03168f9b868
https://github.com/Dolibarr/dolibarr/commit/b8406f842d517962d0b5f16e93b4c03168f9b868
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-15 (Thu, 15 Aug 2019)
Changed paths:
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/list.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
Fix total on list and amount opened on thirdparty card (for supplier)
Commit: 18eb2a83fe7c2d01bdb34cceec389a6f9541e1f6
https://github.com/Dolibarr/dolibarr/commit/18eb2a83fe7c2d01bdb34cceec389a6f9541e1f6
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-17 (Sat, 17 Aug 2019)
Changed paths:
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/class/html.formfile.class.php
M htdocs/user/card.php
Log Message:
-----------
FIX #11671 CVE-2019-15062
Commit: 0be59646a848760b52d6761748187fa454617b21
https://github.com/Dolibarr/dolibarr/commit/0be59646a848760b52d6761748187fa454617b21
Author: ptibogxiv <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/modules/oauth/stripelive_oauthcallback.php
Log Message:
-----------
Update stripelive_oauthcallback.php
Commit: 06fdd5ddbc116a3f9894f7c25df7cfbe5265ab76
https://github.com/Dolibarr/dolibarr/commit/06fdd5ddbc116a3f9894f7c25df7cfbe5265ab76
Author: ptibogxiv <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/modules/oauth/stripelive_oauthcallback.php
Log Message:
-----------
Update stripelive_oauthcallback.php
Commit: 2d59f6bb3d1c17ceefa6be3e32f04e117e45f6da
https://github.com/Dolibarr/dolibarr/commit/2d59f6bb3d1c17ceefa6be3e32f04e117e45f6da
Author: Regis Houssin <address@hidden>
Date: 2019-08-23 (Fri, 23 Aug 2019)
Changed paths:
M htdocs/compta/sociales/class/chargesociales.class.php
Log Message:
-----------
FIX avoid sql error if fk_project is empty during update
Commit: 839ba76ae4da2ee11f544e9f6e2acb733ef691b5
https://github.com/Dolibarr/dolibarr/commit/839ba76ae4da2ee11f544e9f6e2acb733ef691b5
Author: ptibogxiv <address@hidden>
Date: 2019-08-23 (Fri, 23 Aug 2019)
Changed paths:
M htdocs/core/modules/oauth/stripetest_oauthcallback.php
Log Message:
-----------
Update stripetest_oauthcallback.php
Commit: b7e7ca46b577917416ccbf545e22024b1808df42
https://github.com/Dolibarr/dolibarr/commit/b7e7ca46b577917416ccbf545e22024b1808df42
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-23 (Fri, 23 Aug 2019)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
Fix responsive
Commit: 064ab389ed0030e19514fcea944f6d64af212e03
https://github.com/Dolibarr/dolibarr/commit/064ab389ed0030e19514fcea944f6d64af212e03
Author: Regis Houssin <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/compta/paiement.php
M htdocs/projet/index.php
Log Message:
-----------
FIX wrong parameters (same error in branch 9, 10, develop)
Commit: 73a6b45e23ac22c070ab69c4d37e5ade23bf6c51
https://github.com/Dolibarr/dolibarr/commit/73a6b45e23ac22c070ab69c4d37e5ade23bf6c51
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Fix load langs in takepos
Commit: bb763ecb59bfafde02b8095ef4a8721dba358b86
https://github.com/Dolibarr/dolibarr/commit/bb763ecb59bfafde02b8095ef4a8721dba358b86
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Fix lang in takepos
Commit: c4b18890d952a2e1611d08b419ebf295c1db6c4c
https://github.com/Dolibarr/dolibarr/commit/c4b18890d952a2e1611d08b419ebf295c1db6c4c
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Update invoice.php
Commit: 2be125e647daa8680559a7900cacac959b8a89c1
https://github.com/Dolibarr/dolibarr/commit/2be125e647daa8680559a7900cacac959b8a89c1
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Fix display context for takepos in invoice list
fix for thirdparty name and create button
Commit: 7112fcee9a6031a93294f235f132f55a3ac65906
https://github.com/Dolibarr/dolibarr/commit/7112fcee9a6031a93294f235f132f55a3ac65906
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Update list.php
Commit: 7b5c9818f7b25b623a68b472f7f79a3083d1898d
https://github.com/Dolibarr/dolibarr/commit/7b5c9818f7b25b623a68b472f7f79a3083d1898d
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Fix context display with takepos societe/list.php
Commit: dbcead47e1eaf8c972b0850704eafe7409341cd1
https://github.com/Dolibarr/dolibarr/commit/dbcead47e1eaf8c972b0850704eafe7409341cd1
Author: ptibogxiv <address@hidden>
Date: 2019-08-24 (Sat, 24 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Update list.php
Commit: 60c3cefc53040eaaf3f311a73b4bc5db03cf7aaa
https://github.com/Dolibarr/dolibarr/commit/60c3cefc53040eaaf3f311a73b4bc5db03cf7aaa
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-25 (Sun, 25 Aug 2019)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
FIX Api of documents work with value 'thirdparty'
Commit: b00020c4ea2bc948feff82b8e491637337798779
https://github.com/Dolibarr/dolibarr/commit/b00020c4ea2bc948feff82b8e491637337798779
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/loan/card.php
Log Message:
-----------
FIX #11746 Unable to modify amount of insurance of a loan
Commit: 76691925a4796474dc8d60b36b143c01e9eb8f6c
https://github.com/Dolibarr/dolibarr/commit/76691925a4796474dc8d60b36b143c01e9eb8f6c
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/salaries/card.php
M htdocs/compta/sociales/card.php
M htdocs/compta/tva/card.php
M htdocs/loan/card.php
Log Message:
-----------
FIX Missing div for buttons in tax, loan, various payment modules
Commit: be93cd839f7572109bfde0281250ce5c3296e775
https://github.com/Dolibarr/dolibarr/commit/be93cd839f7572109bfde0281250ce5c3296e775
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/loan/card.php
Log Message:
-----------
Merge pull request #11748 from aspangaro/10.0_p6
FIX #11746 Unable to modify amount of insurance of a loan
Commit: 7ebd79a45f796068c3e37e8ab0d1b9b33ea21964
https://github.com/Dolibarr/dolibarr/commit/7ebd79a45f796068c3e37e8ab0d1b9b33ea21964
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Update list.php
Commit: 56ee89c38da50bdc38d349d00c02cd3d1979d9f5
https://github.com/Dolibarr/dolibarr/commit/56ee89c38da50bdc38d349d00c02cd3d1979d9f5
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #11742 from ptibogxiv/patch-242
Fix lang in societe/list.php
Commit: 0c8640bfd9c52e2fc1a22641f9327504a1cf3d12
https://github.com/Dolibarr/dolibarr/commit/0c8640bfd9c52e2fc1a22641f9327504a1cf3d12
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/core/tpl/contacts.tpl.php
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
FIX #11752
Commit: 9e7796d495ebd4dbf16835467c7d45ae96d93001
https://github.com/Dolibarr/dolibarr/commit/9e7796d495ebd4dbf16835467c7d45ae96d93001
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/loan/card.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: d08ed9fbcf2f2c50b3d59269bf6745ded98f6cfd
https://github.com/Dolibarr/dolibarr/commit/d08ed9fbcf2f2c50b3d59269bf6745ded98f6cfd
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
FIX column jabberid missing
Commit: b21818a510872a50368f02bc83c9abcfea053d36
https://github.com/Dolibarr/dolibarr/commit/b21818a510872a50368f02bc83c9abcfea053d36
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/salaries/card.php
M htdocs/compta/sociales/card.php
M htdocs/compta/tva/card.php
M htdocs/loan/card.php
Log Message:
-----------
Merge pull request #11753 from aspangaro/10.0_p7
FIX Missing div for buttons in tax, loan, various payment modules
Commit: 6771a2e1f9e5ec38b65088cbb95ff78ad1dde99f
https://github.com/Dolibarr/dolibarr/commit/6771a2e1f9e5ec38b65088cbb95ff78ad1dde99f
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Update invoice.php
Commit: 8a6c27379f09fcb19bc81be01d90559bd921871c
https://github.com/Dolibarr/dolibarr/commit/8a6c27379f09fcb19bc81be01d90559bd921871c
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge pull request #11737 from ptibogxiv/patch-237
Fix lang in takepos
Commit: 238970c069f0f5f72e6278ef152eeadf5aebf5a5
https://github.com/Dolibarr/dolibarr/commit/238970c069f0f5f72e6278ef152eeadf5aebf5a5
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/paiement.php
M htdocs/projet/index.php
Log Message:
-----------
Merge pull request #11734 from hregis/8.0_mc2
FIX wrong parameters
Commit: 039a613ea11f479dd78762c071e2f0991fa7bd1f
https://github.com/Dolibarr/dolibarr/commit/039a613ea11f479dd78762c071e2f0991fa7bd1f
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/core/modules/oauth/stripetest_oauthcallback.php
Log Message:
-----------
Merge pull request #11728 from ptibogxiv/patch-231
Fix stripetest_oauthcallback.php
Commit: 2b8c57b71495cfb8dd12f8078053f4231fecfadf
https://github.com/Dolibarr/dolibarr/commit/2b8c57b71495cfb8dd12f8078053f4231fecfadf
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/core/modules/oauth/stripelive_oauthcallback.php
Log Message:
-----------
Merge pull request #11724 from ptibogxiv/patch-228
Fix stripelive_oauthcallback.php
Commit: 11acedbe590da7e44a3f3505a2cc240de0af5dc6
https://github.com/Dolibarr/dolibarr/commit/11acedbe590da7e44a3f3505a2cc240de0af5dc6
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge pull request #11735 from ptibogxiv/patch-235
Fix load langs in takepos
Commit: 11dbe80a7b092cd21b5ecf6ea2b3308411858221
https://github.com/Dolibarr/dolibarr/commit/11dbe80a7b092cd21b5ecf6ea2b3308411858221
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #11740 from ptibogxiv/patch-240
Fix context display with takepos societe/list.php
Commit: fc1381c056765f27b5f3198e382a37decdf63540
https://github.com/Dolibarr/dolibarr/commit/fc1381c056765f27b5f3198e382a37decdf63540
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #11739 from ptibogxiv/patch-239
Fix display context for takepos in invoice/list.php
Commit: bdd57ecce708e21eacd2a62f9749539bed07c504
https://github.com/Dolibarr/dolibarr/commit/bdd57ecce708e21eacd2a62f9749539bed07c504
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/sociales/class/chargesociales.class.php
Log Message:
-----------
Merge pull request #11727 from hregis/7.0_price
FIX avoid sql error if fk_project is empty during update
Commit: 60b8982a7407e94dded099325cd3657e8cc4fc26
https://github.com/Dolibarr/dolibarr/commit/60b8982a7407e94dded099325cd3657e8cc4fc26
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/sociales/class/chargesociales.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: dcfbba9af529bbdb2f3b969c18b0264328731cea
https://github.com/Dolibarr/dolibarr/commit/dcfbba9af529bbdb2f3b969c18b0264328731cea
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/paiement.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/list.php
M htdocs/projet/index.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
Commit: 9d2942bb88d0f93b5c5b78b60fadf9d4170d5e7d
https://github.com/Dolibarr/dolibarr/commit/9d2942bb88d0f93b5c5b78b60fadf9d4170d5e7d
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: c93e6550ced81338653a47304aa62a4505f2b66a
https://github.com/Dolibarr/dolibarr/commit/c93e6550ced81338653a47304aa62a4505f2b66a
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/paiement.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/list.php
M htdocs/projet/index.php
M htdocs/societe/class/societe.class.php
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
Commit: 7c5fc9f3f8040468de09df520a3028f0a5e836d5
https://github.com/Dolibarr/dolibarr/commit/7c5fc9f3f8040468de09df520a3028f0a5e836d5
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/facture/list.php
M htdocs/compta/salaries/card.php
M htdocs/compta/sociales/card.php
M htdocs/compta/tva/card.php
M htdocs/core/modules/oauth/stripelive_oauthcallback.php
M htdocs/core/modules/oauth/stripetest_oauthcallback.php
M htdocs/loan/card.php
M htdocs/societe/list.php
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 999db7ed41811eb49140a8d6b56864c7a069627d
https://github.com/Dolibarr/dolibarr/commit/999db7ed41811eb49140a8d6b56864c7a069627d
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-26 (Mon, 26 Aug 2019)
Changed paths:
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/card.php
M htdocs/contact/list.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/modules/oauth/stripelive_oauthcallback.php
M htdocs/core/modules/oauth/stripetest_oauthcallback.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/list.php
M htdocs/langs/en_US/companies.lang
M htdocs/loan/card.php
M htdocs/projet/index.php
M htdocs/salaries/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/takepos/invoice.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/bc5e5be3bf8a...999db7ed4181