[Dolibarr-git] [Dolibarr/dolibarr] c6b263: fix bug in contract update line (wrong vat variabl...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c6b263c586681541782f58f34a7c8c5189280649
      
https://github.com/Dolibarr/dolibarr/commit/c6b263c586681541782f58f34a7c8c5189280649
  Author: Christophe Battarel <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  fix bug in contract update line (wrong vat variable name)


  Commit: 2dce0c68e88b1a087d7713b674fc1063d32e5b13
      
https://github.com/Dolibarr/dolibarr/commit/2dce0c68e88b1a087d7713b674fc1063d32e5b13
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  Merge pull request #652 from cbattarel/3.3

3.3 : fix bug in contract update line (wrong vat variable name)


  Commit: 031bc911ea5b2e25efc06c7f8f418379baf5a239
      
https://github.com/Dolibarr/dolibarr/commit/031bc911ea5b2e25efc06c7f8f418379baf5a239
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M htdocs/admin/const.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  Fix: Mass save or update of const fails.


  Commit: 365680d90eab9faee8d37b4bdc21e0ee2b0873a8
      
https://github.com/Dolibarr/dolibarr/commit/365680d90eab9faee8d37b4bdc21e0ee2b0873a8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_tva.sql

  Log Message:
  -----------
  Fix: Missing vat rates


  Commit: f043fcfaf7c99644c96ff5d84874dd24d5a8fb3e
      
https://github.com/Dolibarr/dolibarr/commit/f043fcfaf7c99644c96ff5d84874dd24d5a8fb3e
  Author: fhenry <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
        Fix bug [ bug #709 ]


  Commit: 5ad0e12f7acc2e436cdc30e446863c7819fb3c1a
      
https://github.com/Dolibarr/dolibarr/commit/5ad0e12f7acc2e436cdc30e446863c7819fb3c1a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Merge pull request #654 from FHenry/3.3

        Fix bug [ bug #709 ]


  Commit: aff919fd10f5cb411139ae044344db6741c1da38
      
https://github.com/Dolibarr/dolibarr/commit/aff919fd10f5cb411139ae044344db6741c1da38
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix: Bad test


  Commit: d2074d1a176c3ca57ce9480e89a1bb482c9a7c4b
      
https://github.com/Dolibarr/dolibarr/commit/d2074d1a176c3ca57ce9480e89a1bb482c9a7c4b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: When creating invoice from other object, type must be standard only


  Commit: b434f58af3458744e4357c03e9b0db4c553b34c8
      
https://github.com/Dolibarr/dolibarr/commit/b434f58af3458744e4357c03e9b0db4c553b34c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: When creating invoice from other object, type must be standard only


  Commit: df2fde3a68b747fe1df13a8bea848a3391dc4bc4
      
https://github.com/Dolibarr/dolibarr/commit/df2fde3a68b747fe1df13a8bea848a3391dc4bc4
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.3 release


  Commit: b0695d3bbb64ab46380cbc585d1a7affe527e551
      
https://github.com/Dolibarr/dolibarr/commit/b0695d3bbb64ab46380cbc585d1a7affe527e551
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    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:
  -----------
  Preapre 3.3


  Commit: b21cb5b899709deb5c23dafa23e6e3b2301b755b
      
https://github.com/Dolibarr/dolibarr/commit/b21cb5b899709deb5c23dafa23e6e3b2301b755b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    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/comm/action/listactions.php
    M htdocs/compta/facture.php
    M htdocs/install/mysql/data/llx_c_tva.sql

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

Conflicts:
        build/exe/doliwamp/doliwamp.iss
        build/makepack-dolibarr.pl
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/compta/facture.php
        htdocs/filefunc.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9a951e4d6d00...b21cb5b89970