dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] d7060b: FIX #6360


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] d7060b: FIX #6360
Date: Wed, 08 Feb 2017 02:00:32 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d7060b0c4b8c53a578da5933d336eeee9b534579
      
https://github.com/Dolibarr/dolibarr/commit/d7060b0c4b8c53a578da5933d336eeee9b534579
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  FIX #6360


  Commit: 480d099d81764beb334d0c14fe2e998d7d5240d2
      
https://github.com/Dolibarr/dolibarr/commit/480d099d81764beb334d0c14fe2e998d7d5240d2
  Author: arnaud <address@hidden>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Fix project filter traduction


  Commit: fea2b081f9b2e91a6366c1d98d41f9dd125122f7
      
https://github.com/Dolibarr/dolibarr/commit/fea2b081f9b2e91a6366c1d98d41f9dd125122f7
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-04 (Sat, 04 Feb 2017)

  Changed paths:
    M htdocs/admin/modules.php

  Log Message:
  -----------
  Fix: The long description feature will be available with 6.0. Large
content creates problem with tooltip.


  Commit: 6cb3199824cb5858259053bf13be2d76679a4751
      
https://github.com/Dolibarr/dolibarr/commit/6cb3199824cb5858259053bf13be2d76679a4751
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/compta/prelevement/index.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Translation message


  Commit: bbf34bfda8c3007b9e66dfe77a1e0811f34af80d
      
https://github.com/Dolibarr/dolibarr/commit/bbf34bfda8c3007b9e66dfe77a1e0811f34af80d
  Author: De Coninck Laurent <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  [expense type deactivate] [#6363] Expense type deactivated but list

When an expense type is disabled in dictionaries, it's always displayed and 
selectable in expense note module, when we create a new line in an expense note.


  Commit: bee507c76cd66bf53291e62b3f0a9ce972f9224b
      
https://github.com/Dolibarr/dolibarr/commit/bee507c76cd66bf53291e62b3f0a9ce972f9224b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Merge pull request #6386 from laudeco/fix/expense_type_deactivate

[expense type deactivate] [#6363] Expense type deactivated but list


  Commit: 821978d54c007df01b6d8aa0ac64911a2806c268
      
https://github.com/Dolibarr/dolibarr/commit/821978d54c007df01b6d8aa0ac64911a2806c268
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  FIX #6363 More complete fix


  Commit: b447501d72a07dd601b80a120283d5b162f02e38
      
https://github.com/Dolibarr/dolibarr/commit/b447501d72a07dd601b80a120283d5b162f02e38
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge pull request #6371 from atm-arnaud/4.0_fix_trad_project_filter

Fix project filter traduction


  Commit: 6b528b2bea50af4b779ed91ae1faea7de0a76f32
      
https://github.com/Dolibarr/dolibarr/commit/6b528b2bea50af4b779ed91ae1faea7de0a76f32
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/supplier_proposal.lang

  Log Message:
  -----------
  Fix translation: Open -> opened (open is for "mind/spirit", opened is
the adjective for a status)


  Commit: afa68a141827d1742551d9a3f157b917182ed241
      
https://github.com/Dolibarr/dolibarr/commit/afa68a141827d1742551d9a3f157b917182ed241
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/adherents/list.php

  Log Message:
  -----------
  Fix label for late


  Commit: 2d77cb2da5ee371ae8ca00d992b1a4b9dc42fffa
      
https://github.com/Dolibarr/dolibarr/commit/2d77cb2da5ee371ae8ca00d992b1a4b9dc42fffa
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql

  Log Message:
  -----------
  FIX #6379


  Commit: b0ee04c0791f3fb36dbec44f84e52c73130569a3
      
https://github.com/Dolibarr/dolibarr/commit/b0ee04c0791f3fb36dbec44f84e52c73130569a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  FIX #6379


  Commit: d56b5f30c88818d1f844279aeb046f0b897ff7c9
      
https://github.com/Dolibarr/dolibarr/commit/d56b5f30c88818d1f844279aeb046f0b897ff7c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/admin/external_rss.php

  Log Message:
  -----------
  FIX #6330


  Commit: df6983b3c5a7e2bd026a016c639d057f3c44739e
      
https://github.com/Dolibarr/dolibarr/commit/df6983b3c5a7e2bd026a016c639d057f3c44739e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0


  Commit: c6e0a4cc87486091ab4521643af09d698870f3ec
      
https://github.com/Dolibarr/dolibarr/commit/c6e0a4cc87486091ab4521643af09d698870f3ec
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  Fix column label


  Commit: fbff32823a83c86de7f505ccd791f23b6434321e
      
https://github.com/Dolibarr/dolibarr/commit/fbff32823a83c86de7f505ccd791f23b6434321e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang

  Log Message:
  -----------
  Fix translation


  Commit: 8e733ca2fe4d0e4a2bb116b779f15dac08ca7b13
      
https://github.com/Dolibarr/dolibarr/commit/8e733ca2fe4d0e4a2bb116b779f15dac08ca7b13
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Remove menu entry that is not reserved to admin users frmo admin area.


  Commit: 0a797cd12e47af7498baff0943c616aa97f90077
      
https://github.com/Dolibarr/dolibarr/commit/0a797cd12e47af7498baff0943c616aa97f90077
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/ldap.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/users.lang

  Log Message:
  -----------
  Fix us terms.


  Commit: 4c3255857c0ab64ad29dc94ac2a85be68cc93337
      
https://github.com/Dolibarr/dolibarr/commit/4c3255857c0ab64ad29dc94ac2a85be68cc93337
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/core/modules/modFacture.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php

  Log Message:
  -----------
  Fix bad syntax into criteria to filter on date in export.
Fix missing type in export of invoices.


  Commit: eb452397bdca76e159aa6221cb5eac859850cd41
      
https://github.com/Dolibarr/dolibarr/commit/eb452397bdca76e159aa6221cb5eac859850cd41
  Author: Paris Liakos <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Wrong trigger when setting supplier invoice back to draft


  Commit: dc0856413c3e2343d5a7120d6390c125df3f7947
      
https://github.com/Dolibarr/dolibarr/commit/dc0856413c3e2343d5a7120d6390c125df3f7947
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/admin/external_rss.php
    M htdocs/fourn/facture/list.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0


  Commit: 31c3398b7fada79693dfade2fb97c92e99b9e63c
      
https://github.com/Dolibarr/dolibarr/commit/31c3398b7fada79693dfade2fb97c92e99b9e63c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/adherents/list.php
    M htdocs/admin/external_rss.php
    M htdocs/compta/prelevement/index.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/list.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    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/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/ldap.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/product/stock/replenish.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop

Conflicts:
        htdocs/admin/modules.php


  Commit: b250485efd0e4aefb668b8d5dc6a08a1f7ecb093
      
https://github.com/Dolibarr/dolibarr/commit/b250485efd0e4aefb668b8d5dc6a08a1f7ecb093
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/admin/modulehelp.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/775cd8ca7d39...b250485efd0e

reply via email to

[Prev in Thread] Current Thread [Next in Thread]