[Dolibarr-git] [Dolibarr/dolibarr] f460d2: Update Segment.php

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f460d2e705ede1ee91420f48fb0a92606f01ee78
      
https://github.com/Dolibarr/dolibarr/commit/f460d2e705ede1ee91420f48fb0a92606f01ee78
  Author: mikee2 <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/includes/odtphp/Segment.php

  Log Message:
  -----------
  Update Segment.php


  Commit: c82ee862aff7f19f7acae65a81ac104f86195bd8
      
https://github.com/Dolibarr/dolibarr/commit/c82ee862aff7f19f7acae65a81ac104f86195bd8
  Author: mikee2 <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/includes/odtphp/Segment.php

  Log Message:
  -----------
  Merge pull request #1 from mikee2/mikee2-odtphp-patch-1

Update Segment.php


  Commit: e6b20840a3d66db0bcf8053fcc2aa7540cd46b63
      
https://github.com/Dolibarr/dolibarr/commit/e6b20840a3d66db0bcf8053fcc2aa7540cd46b63
  Author: mikee2 <address@hidden>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M htdocs/includes/odtphp/Segment.php

  Log Message:
  -----------
  Update Segment.php


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

  Changed paths:
    M htdocs/includes/odtphp/Segment.php

  Log Message:
  -----------
  Merge pull request #6685 from mikee2/develop

Add macro replacement to ODT invoice lines


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a8c775dcbda7...bb47c69283fb