[Dolibarr-git] [Dolibarr/dolibarr] fb4d62: Fix: Some fix into the canvas for companies.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fb4d62c34af6454bac8a3510162cfb8b2c7a13b8
      
https://github.com/Dolibarr/dolibarr/commit/fb4d62c34af6454bac8a3510162cfb8b2c7a13b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/canvas/company/actions_card_company.class.php
    M htdocs/societe/canvas/company/tpl/card_create.tpl.php
    M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
    M htdocs/societe/canvas/individual/actions_card_individual.class.php
    M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php

  Log Message:
  -----------
  Fix: Some fix into the canvas for companies.


  Commit: 6d245e6f3199ad61a0521b10bfcf5b99a82ffd01
      
https://github.com/Dolibarr/dolibarr/commit/6d245e6f3199ad61a0521b10bfcf5b99a82ffd01
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/adherents/document.php
    M htdocs/admin/security_other.php
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/docother.php
    M htdocs/ecm/index.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/ftp/index.php
    A htdocs/product/canvas/product/actions_card_product.class.php
    A htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/document.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php

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


  Commit: 705c152f7ac88c5fbfb58f446e25b6ebd86011ab
      
https://github.com/Dolibarr/dolibarr/commit/705c152f7ac88c5fbfb58f446e25b6ebd86011ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: js not escaped


  Commit: c2db3265ec8c34937ecdbaf29a3fcf994f674210
      
https://github.com/Dolibarr/dolibarr/commit/c2db3265ec8c34937ecdbaf29a3fcf994f674210
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/adherents/document.php
    M htdocs/admin/security_other.php
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/core/lib/files.lib.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/docother.php
    M htdocs/ecm/index.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/ftp/index.php
    M htdocs/product/document.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php
    M htdocs/viewimage.php

  Log Message:
  -----------
  Fix: Regression with quot management. Try a better fix.


  Commit: 17b50e02b77eb36b9ee059fb74d3051258645928
      
https://github.com/Dolibarr/dolibarr/commit/17b50e02b77eb36b9ee059fb74d3051258645928
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/tpl/ajax/fileupload_main.tpl.php
    A htdocs/core/tpl/ajax/fileupload_view.tpl.php
    R htdocs/core/tpl/ajaxfileupload.tpl.php
    M htdocs/includes/jquery/plugins/fileupload/README.md
    R htdocs/includes/jquery/plugins/fileupload/README.txt
    A htdocs/includes/jquery/plugins/fileupload/css/bootstrap.min.css
    A htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
    A 
htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings-white.png
    A htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings.png
    A htdocs/includes/jquery/plugins/fileupload/img/loading.gif
    A htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.css
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.iframe-transport.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.tmpl.min.js
    A htdocs/includes/jquery/plugins/fileupload/js/bootstrap.min.js
    A 
htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/main.js
    A htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
    R htdocs/includes/jquery/plugins/fileupload/pbar-ani.gif
    A htdocs/includes/jquery/plugins/template/README.md
    A htdocs/includes/jquery/plugins/template/compile.js
    A htdocs/includes/jquery/plugins/template/runtime.js
    A htdocs/includes/jquery/plugins/template/tmpl.js
    A htdocs/includes/jquery/plugins/template/tmpl.min.js
    M htdocs/main.inc.php

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


Compare: https://github.com/Dolibarr/dolibarr/compare/1ea7e53...17b50e0