[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c4513a: Fix extrafields resource
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c4513a: Fix extrafields resource |
|
Date: |
Sun, 15 Jul 2018 11:17:38 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c4513a755dc8b3fb174c9c5c2493ba1c1c65f036
https://github.com/Dolibarr/dolibarr/commit/c4513a755dc8b3fb174c9c5c2493ba1c1c65f036
Author: Inovea Conseil <address@hidden>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M htdocs/resource/list.php
Log Message:
-----------
Fix extrafields resource
Commit: 2824afa75c46a5f456ecf754ee84f2c11582f069
https://github.com/Dolibarr/dolibarr/commit/2824afa75c46a5f456ecf754ee84f2c11582f069
Author: Regis Houssin <address@hidden>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Fix: avoid a non numeric value !!
Commit: 964f11491fd454671f3906e317dfac826dab993e
https://github.com/Dolibarr/dolibarr/commit/964f11491fd454671f3906e317dfac826dab993e
Author: Regis Houssin <address@hidden>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Revert "Fix: avoid a non numeric value !!"
This reverts commit 2824afa75c46a5f456ecf754ee84f2c11582f069.
Commit: 4925624ed9b88f1ce80b39d03a7be5daee5d0b65
https://github.com/Dolibarr/dolibarr/commit/4925624ed9b88f1ce80b39d03a7be5daee5d0b65
Author: Regis Houssin <address@hidden>
Date: 2018-06-30 (Sat, 30 Jun 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix: avoid NULL value when "subprice" is 0
Commit: d53f03b5968f6c8c611f8e86670bfc0729313541
https://github.com/Dolibarr/dolibarr/commit/d53f03b5968f6c8c611f8e86670bfc0729313541
Author: Inovea Conseil <address@hidden>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
Log Message:
-----------
Update after comment
Commit: dc7fcc009bfbdcb4e7624fce4475f41a85a0fefc
https://github.com/Dolibarr/dolibarr/commit/dc7fcc009bfbdcb4e7624fce4475f41a85a0fefc
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Update propal.class.php
Commit: ed3023f7d990175f70401f771b0b8fcdf60224b6
https://github.com/Dolibarr/dolibarr/commit/ed3023f7d990175f70401f771b0b8fcdf60224b6
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Update propal.class.php
Commit: c0d6aee040266ba5783af1bc66aeccd483708ad9
https://github.com/Dolibarr/dolibarr/commit/c0d6aee040266ba5783af1bc66aeccd483708ad9
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Update propal.class.php
Commit: bda142d82d70d896570124ac888a1962b64b5677
https://github.com/Dolibarr/dolibarr/commit/bda142d82d70d896570124ac888a1962b64b5677
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Update commande.class.php
Commit: f52187e829f4ea742585b81a9e1997cddc49e634
https://github.com/Dolibarr/dolibarr/commit/f52187e829f4ea742585b81a9e1997cddc49e634
Author: Regis Houssin <address@hidden>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M htdocs/admin/const.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/menus/edit.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/translation.php
M htdocs/compta/facture/card.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/expensereport/list.php
M htdocs/hrm/index.php
M htdocs/index.php
M htdocs/install/step1.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/loan/index.php
M htdocs/product/reassort.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stats/supplier_proposal.php
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price
Commit: 0c252d9778774585c232b87a01d47c7c0ca651e9
https://github.com/Dolibarr/dolibarr/commit/0c252d9778774585c232b87a01d47c7c0ca651e9
Author: atm-ph <address@hidden>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix user rights overrided by user group rights
Commit: cb0553c3bff41717d94693e51e1f5b69f9322495
https://github.com/Dolibarr/dolibarr/commit/cb0553c3bff41717d94693e51e1f5b69f9322495
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #9094 from atm-ph/fix_7.0_getrights
Fix user rights overrided by user group rights
Commit: a5442033ac1795fd3e69fdf80f844ae6b41fbc93
https://github.com/Dolibarr/dolibarr/commit/a5442033ac1795fd3e69fdf80f844ae6b41fbc93
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Code comment
Commit: b690306b70d88e891ececf5af67094de51cb98ec
https://github.com/Dolibarr/dolibarr/commit/b690306b70d88e891ececf5af67094de51cb98ec
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #9027 from hregis/7.0_price
Fix: avoid a non numeric value !!
Commit: e92052353d532cdc49afc25e256cebc1aeebc4df
https://github.com/Dolibarr/dolibarr/commit/e92052353d532cdc49afc25e256cebc1aeebc4df
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M htdocs/resource/list.php
Log Message:
-----------
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource
Fix extrafields resource
Commit: f3b7bc53bd39b893eb72d0e50fe3e879fd593497
https://github.com/Dolibarr/dolibarr/commit/f3b7bc53bd39b893eb72d0e50fe3e879fd593497
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/resource/list.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
Commit: 1e42db064135d8d094fa9f00307893c47b61cd36
https://github.com/Dolibarr/dolibarr/commit/1e42db064135d8d094fa9f00307893c47b61cd36
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/api/class/api_documents.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modStripe.class.php
M htdocs/core/modules/modSupplierProposal.class.php
M htdocs/core/modules/modSyslog.class.php
M htdocs/core/modules/modTax.class.php
M htdocs/core/modules/modTicket.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/modules/modVariants.class.php
M htdocs/core/modules/modWebServices.class.php
M htdocs/core/modules/modWebServicesClient.class.php
M htdocs/core/modules/modWebsite.class.php
M htdocs/core/modules/modWorkflow.class.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/filefunc.inc.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: d968a61445e0be96234328536b243f582c976452
https://github.com/Dolibarr/dolibarr/commit/d968a61445e0be96234328536b243f582c976452
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/resource/list.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/9b644fb92f3f...d968a61445e0
**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.