[Dolibarr-git] [Dolibarr/dolibarr] dcd11f: FIX: Missing Supplier Order Translation String

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dcd11f0c71e9140583d99b656cc4e4f907eec495
      
https://github.com/Dolibarr/dolibarr/commit/dcd11f0c71e9140583d99b656cc4e4f907eec495
  Author: IJ <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

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

  Log Message:
  -----------
  FIX: Missing Supplier Order Translation String


  Commit: fd63c91a18b0c5850ba7d1e7bef0fecdee16bf60
      
https://github.com/Dolibarr/dolibarr/commit/fd63c91a18b0c5850ba7d1e7bef0fecdee16bf60
  Author: IJ <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

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

  Log Message:
  -----------
  Add Missing Translation String - Expense Report

Add Debit/Credit Card (text) to Expense Report payment type form fields when 
used.


  Commit: c2f1826ac915871cc10912210d75ba44cac967d9
      
https://github.com/Dolibarr/dolibarr/commit/c2f1826ac915871cc10912210d75ba44cac967d9
  Author: IJ <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

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

  Log Message:
  -----------
  Add status


  Commit: 63162c1bac7c08988b2448b262b80b732eab9de3
      
https://github.com/Dolibarr/dolibarr/commit/63162c1bac7c08988b2448b262b80b732eab9de3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

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

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/aljawaid/dolibarr into
aljawaid-develop

Conflicts:
        htdocs/langs/en_US/agenda.lang
        htdocs/langs/en_US/bills.lang


  Commit: 74980ba31b9a310d72fe42ac26e748afd5c3c9a8
      
https://github.com/Dolibarr/dolibarr/commit/74980ba31b9a310d72fe42ac26e748afd5c3c9a8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

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

  Log Message:
  -----------
  git push origin developMerge branch 'aljawaid-develop' into develop


  Commit: 7cf4703b73bfaa412ab9506d5fcb4e38f044c90c
      
https://github.com/Dolibarr/dolibarr/commit/7cf4703b73bfaa412ab9506d5fcb4e38f044c90c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
    M build/composer/README
    M composer.json
    M composer.lock
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/expensereport/card.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/perms.php
    M htdocs/websites/index.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/348e004da62f...7cf4703b73bf