[Dolibarr/dolibarr] c494e3: Trans

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c494e3029be3d0509fd55d96090a76fec2486a90
      
https://github.com/Dolibarr/dolibarr/commit/c494e3029be3d0509fd55d96090a76fec2486a90
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-24 (Fri, 24 Jan 2020)

  Changed paths:
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Trans


  Commit: cc6b9269f9bb5f8f8b2aea44e8e61a09f31fbcd4
      
https://github.com/Dolibarr/dolibarr/commit/cc6b9269f9bb5f8f8b2aea44e8e61a09f31fbcd4
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/list.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/theme_vars.inc.php
    M htdocs/theme/md/theme_vars.inc.php

  Log Message:
  -----------
  Fix look and feel v11


  Commit: be70232bfe5e7727f508ee5d224364d8726f4972
      
https://github.com/Dolibarr/dolibarr/commit/be70232bfe5e7727f508ee5d224364d8726f4972
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/stats/index.php

  Log Message:
  -----------
  Clean code


  Commit: 09e707b8187db017b0c444d55ad154174f2ca436
      
https://github.com/Dolibarr/dolibarr/commit/09e707b8187db017b0c444d55ad154174f2ca436
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  trans


  Commit: de6b30be8c0a1b693d2ff2e5a95bbad7720e7c49
      
https://github.com/Dolibarr/dolibarr/commit/de6b30be8c0a1b693d2ff2e5a95bbad7720e7c49
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php

  Log Message:
  -----------
  Look and feel v11


  Commit: 09f809f347df80160aed14af2ee9362dbb6025e4
      
https://github.com/Dolibarr/dolibarr/commit/09f809f347df80160aed14af2ee9362dbb6025e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  FIX #12913


  Commit: f2771b33658ec0cd85974cfbc5501171e787068e
      
https://github.com/Dolibarr/dolibarr/commit/f2771b33658ec0cd85974cfbc5501171e787068e
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/cashcontrol/cashcontrol_list.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modTakePos.class.php
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  FIX #12896


  Commit: 0f2141269a1e922345226733cd8a1fc80f32410e
      
https://github.com/Dolibarr/dolibarr/commit/0f2141269a1e922345226733cd8a1fc80f32410e
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-25 (Sat, 25 Jan 2020)

  Changed paths:
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/cashcontrol/cashcontrol_list.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modTakePos.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/list.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/stats/index.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/langs/en_US/main.lang
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/takepos/takepos.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/theme_vars.inc.php
    M htdocs/theme/md/theme_vars.inc.php

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

Conflicts:
        htdocs/supplier_proposal/class/supplier_proposal.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/06731bdd59e0...0f2141269a1e