[Dolibarr-git] [Dolibarr/dolibarr] a94017: FIX letter for month March

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a94017ba256bab297f56fc3b147a15bc400c27d1
      
https://github.com/Dolibarr/dolibarr/commit/a94017ba256bab297f56fc3b147a15bc400c27d1
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

  Log Message:
  -----------
  FIX letter for month March


  Commit: fe94562a56acca9735ad84bf3869b85f58cb13a7
      
https://github.com/Dolibarr/dolibarr/commit/fe94562a56acca9735ad84bf3869b85f58cb13a7
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 7.0.1


  Commit: 96ff5b1b23471631e60c9bb153373581922b728f
      
https://github.com/Dolibarr/dolibarr/commit/96ff5b1b23471631e60c9bb153373581922b728f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M dev/initdemo/mysqldump_dolibarr_7.0.0.sql
    M htdocs/core/class/html.formmargin.class.php

  Log Message:
  -----------
  Update sql image file for 7.0 stable


  Commit: ff765a2efeac84cac39dbd1c3bd9cce084f1dc69
      
https://github.com/Dolibarr/dolibarr/commit/ff765a2efeac84cac39dbd1c3bd9cce084f1dc69
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M htdocs/fourn/commande/contact.php

  Log Message:
  -----------
  FIX Look and feel v7


  Commit: 46e8692620e8e245820ef274065ba3e91b4842de
      
https://github.com/Dolibarr/dolibarr/commit/46e8692620e8e245820ef274065ba3e91b4842de
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M htdocs/core/lib/admin.lib.php

  Log Message:
  -----------
  Escape db


  Commit: 07fb29f0c44592f038e266b4fa698ba438485dc4
      
https://github.com/Dolibarr/dolibarr/commit/07fb29f0c44592f038e266b4fa698ba438485dc4
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M htdocs/compta/facture/class/api_invoices.class.php

  Log Message:
  -----------
  Fix var not initialized


  Commit: bbb095bcb20ec253520d4098c024977fbf38157c
      
https://github.com/Dolibarr/dolibarr/commit/bbb095bcb20ec253520d4098c024977fbf38157c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M htdocs/compta/localtax/card.php

  Log Message:
  -----------
  FIX css


  Commit: 9997a6c787ce35eb4b8e679b1fb82a84ba221807
      
https://github.com/Dolibarr/dolibarr/commit/9997a6c787ce35eb4b8e679b1fb82a84ba221807
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M dev/initdemo/mysqldump_dolibarr_7.0.0.sql
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/langs/fr_FR/main.lang

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

Conflicts:
        htdocs/filefunc.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e639f2a91fc2...9997a6c787ce