[Dolibarr-git] [Dolibarr/dolibarr] ce5514: Fix sql begin at wrong place

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ce5514bd68a5c7f4e782c7c1600db88c8f43920b
      
https://github.com/Dolibarr/dolibarr/commit/ce5514bd68a5c7f4e782c7c1600db88c8f43920b
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/supplier/lines.php

  Log Message:
  -----------
  Fix sql begin at wrong place


  Commit: 31067b62500a74e7fd8ae3347a81e16d77af2b38
      
https://github.com/Dolibarr/dolibarr/commit/31067b62500a74e7fd8ae3347a81e16d77af2b38
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/supplier/lines.php

  Log Message:
  -----------
  FIX picto for type in product link in accountany list is wrong


  Commit: 4f877e79709c84b675c0baadfadf7e3fbba350d2
      
https://github.com/Dolibarr/dolibarr/commit/4f877e79709c84b675c0baadfadf7e3fbba350d2
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/supplier/lines.php

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

Conflicts:
        htdocs/accountancy/customer/lines.php
        htdocs/accountancy/supplier/lines.php


  Commit: b64b4abf07a17fa1f7260b6480957c5c41d692f8
      
https://github.com/Dolibarr/dolibarr/commit/b64b4abf07a17fa1f7260b6480957c5c41d692f8
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/product/tpl/card_edit.tpl.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/tpl/card_edit.tpl.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5b019eb985ff...b64b4abf07a1
      **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.