[Dolibarr-git] [Dolibarr/dolibarr] a81c48: Revert "Update objectline_create.tpl.php"

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a81c4830613a12700d6cb907312fa28068858db4
      
https://github.com/Dolibarr/dolibarr/commit/a81c4830613a12700d6cb907312fa28068858db4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  Revert "Update objectline_create.tpl.php"

This reverts commit fdac53bfca37b034a8decfb4f0e568cbc93a5b27.


  Commit: f6ab7ca0c96f69822f10c5173eb71d062294f6bb
      
https://github.com/Dolibarr/dolibarr/commit/f6ab7ca0c96f69822f10c5173eb71d062294f6bb
  Author: aspangaro <address@hidden>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M htdocs/admin/ihm.php

  Log Message:
  -----------
  Typo


  Commit: 5a05d4a4b8efa4d546e84970b491267f0649585f
      
https://github.com/Dolibarr/dolibarr/commit/5a05d4a4b8efa4d546e84970b491267f0649585f
  Author: aspangaro <address@hidden>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M htdocs/core/datepicker.php

  Log Message:
  -----------
  Untranslatable token Calendar in datepicker


  Commit: 4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
      
https://github.com/Dolibarr/dolibarr/commit/4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M htdocs/admin/ihm.php

  Log Message:
  -----------
  Merge pull request #2132 from aspangaro/3.6-patch1

Typo


  Commit: e21d6b09544273ea503c4939df892d8b05393d58
      
https://github.com/Dolibarr/dolibarr/commit/e21d6b09544273ea503c4939df892d8b05393d58
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M htdocs/core/datepicker.php

  Log Message:
  -----------
  Merge pull request #2131 from aspangaro/3.6-patch

Untranslatable token Calendar in datepicker


  Commit: 9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
      
https://github.com/Dolibarr/dolibarr/commit/9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.5.6


  Commit: a07852c6993a937fa48305c197cefd10d396620c
      
https://github.com/Dolibarr/dolibarr/commit/a07852c6993a937fa48305c197cefd10d396620c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php


  Commit: 8d405a147f12b850db438ae4a137b8098291500e
      
https://github.com/Dolibarr/dolibarr/commit/8d405a147f12b850db438ae4a137b8098291500e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/ihm.php
    M htdocs/core/datepicker.php
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        build/debian/changelog
        htdocs/core/tpl/objectline_create.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f6be48f25587...8d405a147f12