[Dolibarr-git] [Dolibarr/dolibarr] 2f14fb: Fix: debug ckeditor and VAT

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2f14fbe791e4bc10cc52fa8e13c0e0db52fc8686
      
https://github.com/Dolibarr/dolibarr/commit/2f14fbe791e4bc10cc52fa8e13c0e0db52fc8686
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M htdocs/core/ajax/price.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/tpl/objectline_add.tpl.php

  Log Message:
  -----------
  Fix: debug ckeditor and VAT


  Commit: fb866d91064e00ce1e50625be4979a3276c4bb65
      
https://github.com/Dolibarr/dolibarr/commit/fb866d91064e00ce1e50625be4979a3276c4bb65
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql
    M htdocs/product/admin/product_tools.php

  Log Message:
  -----------
  Merge branch 'develop' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into develop

Conflicts:
        htdocs/core/lib/ajax.lib.php
        htdocs/core/tpl/objectline_add.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cc22f25d97b4...fb866d91064e