[Dolibarr-git] [Dolibarr/dolibarr] 398e9b: Add ignore

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 398e9bad942d2622c1a799eb1e39b36d0e79a086
      
https://github.com/Dolibarr/dolibarr/commit/398e9bad942d2622c1a799eb1e39b36d0e79a086
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M htdocs/.gitignore

  Log Message:
  -----------
  Add ignore

Conflicts:
        htdocs/.gitignore


  Commit: 8bea703363c927f99acf7a2cc595b59ebf49ad7a
      
https://github.com/Dolibarr/dolibarr/commit/8bea703363c927f99acf7a2cc595b59ebf49ad7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php

  Log Message:
  -----------
  Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
users need. I introduce a hidden option to fix this quickly.


  Commit: 304a71710e0f2f47fd7d9d33b1903990543acfb1
      
https://github.com/Dolibarr/dolibarr/commit/304a71710e0f2f47fd7d9d33b1903990543acfb1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-05 (Sat, 05 Sep 2015)

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

  Log Message:
  -----------
  Fix not complete info


  Commit: a21b015cbba100f55644e47bceb0b1e5c203e6aa
      
https://github.com/Dolibarr/dolibarr/commit/a21b015cbba100f55644e47bceb0b1e5c203e6aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-05 (Sat, 05 Sep 2015)

  Changed paths:
    M htdocs/holiday/list.php
    M htdocs/projet/card.php

  Log Message:
  -----------
  Fix XSS


  Commit: aaa639a3ab6fbe3d63dd4e9f425445f04331f035
      
https://github.com/Dolibarr/dolibarr/commit/aaa639a3ab6fbe3d63dd4e9f425445f04331f035
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.


  Commit: 822d4d1b39f68af7fc5c3245d50b2559fbc09373
      
https://github.com/Dolibarr/dolibarr/commit/822d4d1b39f68af7fc5c3245d50b2559fbc09373
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Fix remove log


  Commit: 91ddca6ab0d3e8944b0c3ff182ddd424326f9598
      
https://github.com/Dolibarr/dolibarr/commit/91ddca6ab0d3e8944b0c3ff182ddd424326f9598
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/holiday/list.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/card.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into develop

Conflicts:
        htdocs/core/tpl/objectline_edit.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7c2b6e778074...91ddca6ab0d3