[Dolibarr-git] [Dolibarr/dolibarr] adb306: Work on nblignes -> nblines

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: adb3062a9f803a0861fdc9cfe21646c6a135dcfa
      
https://github.com/Dolibarr/dolibarr/commit/adb3062a9f803a0861fdc9cfe21646c6a135dcfa
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-29 (Sat, 29 Jun 2019)

  Changed paths:
    M htdocs/admin/boxes.php
    M htdocs/cashdesk/include/environnement.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remx.php
    M htdocs/commande/class/commande.class.php
    A htdocs/commande/contrat/admin/contract_extrafields.php
    A htdocs/commande/contrat/admin/contractdet_extrafields.php
    A htdocs/commande/contrat/admin/index.html
    A htdocs/commande/contrat/card.php
    A htdocs/commande/contrat/class/api_contracts.class.php
    A htdocs/commande/contrat/class/contrat.class.php
    A htdocs/commande/contrat/class/index.html
    A htdocs/commande/contrat/contact.php
    A htdocs/commande/contrat/document.php
    A htdocs/commande/contrat/index.php
    A htdocs/commande/contrat/info.php
    A htdocs/commande/contrat/list.php
    A htdocs/commande/contrat/note.php
    A htdocs/commande/contrat/services_list.php
    A htdocs/commande/contrat/tpl/index.html
    A htdocs/commande/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    R htdocs/contrat/admin/contract_extrafields.php
    R htdocs/contrat/admin/contractdet_extrafields.php
    R htdocs/contrat/admin/index.html
    R htdocs/contrat/card.php
    R htdocs/contrat/class/api_contracts.class.php
    R htdocs/contrat/class/contrat.class.php
    R htdocs/contrat/class/index.html
    R htdocs/contrat/contact.php
    R htdocs/contrat/document.php
    R htdocs/contrat/index.php
    R htdocs/contrat/info.php
    R htdocs/contrat/list.php
    R htdocs/contrat/note.php
    R htdocs/contrat/services_list.php
    R htdocs/contrat/tpl/index.html
    R htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/db/Database.interface.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/pdf.lib.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/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
    M htdocs/core/modules/expedition/doc/pdf_espadon.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/facture/doc/pdf_sponge.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/project/doc/pdf_timespent.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_cornas.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/debugbar/class/TraceableDB.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fichinter/card-rec.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/opensurvey/results.php
    M htdocs/product/fournisseurs.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/reception/class/reception.class.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/ticket/class/ticket.class.php

  Log Message:
  -----------
  Work on nblignes -> nblines


  Commit: 7de92070d7333c1a8848219c4b2d983a6dcd8cbd
      
https://github.com/Dolibarr/dolibarr/commit/7de92070d7333c1a8848219c4b2d983a6dcd8cbd
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-29 (Sat, 29 Jun 2019)

  Changed paths:
    R htdocs/commande/contrat/admin/contract_extrafields.php
    R htdocs/commande/contrat/admin/contractdet_extrafields.php
    R htdocs/commande/contrat/admin/index.html
    R htdocs/commande/contrat/card.php
    R htdocs/commande/contrat/class/api_contracts.class.php
    R htdocs/commande/contrat/class/contrat.class.php
    R htdocs/commande/contrat/class/index.html
    R htdocs/commande/contrat/contact.php
    R htdocs/commande/contrat/document.php
    R htdocs/commande/contrat/index.php
    R htdocs/commande/contrat/info.php
    R htdocs/commande/contrat/list.php
    R htdocs/commande/contrat/note.php
    R htdocs/commande/contrat/services_list.php
    R htdocs/commande/contrat/tpl/index.html
    R htdocs/commande/contrat/tpl/linkedobjectblock.tpl.php
    A htdocs/contrat/admin/contract_extrafields.php
    A htdocs/contrat/admin/contractdet_extrafields.php
    A htdocs/contrat/admin/index.html
    A htdocs/contrat/card.php
    A htdocs/contrat/class/api_contracts.class.php
    A htdocs/contrat/class/contrat.class.php
    A htdocs/contrat/class/index.html
    A htdocs/contrat/contact.php
    A htdocs/contrat/document.php
    A htdocs/contrat/index.php
    A htdocs/contrat/info.php
    A htdocs/contrat/list.php
    A htdocs/contrat/note.php
    A htdocs/contrat/services_list.php
    A htdocs/contrat/tpl/index.html
    A htdocs/contrat/tpl/linkedobjectblock.tpl.php

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

Conflicts:
        htdocs/contrat/card.php
        htdocs/contrat/class/contrat.class.php


  Commit: ce990ff41d859d418bf4af82a1c576cbe913879c
      
https://github.com/Dolibarr/dolibarr/commit/ce990ff41d859d418bf4af82a1c576cbe913879c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-29 (Sat, 29 Jun 2019)

  Changed paths:

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/046f32df4474...ce990ff41d85