[Dolibarr-git] [Dolibarr/dolibarr] b03c1a: Merge pull request #1 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b03c1aed6b122133df6b011fa148e23150366e53
      
https://github.com/Dolibarr/dolibarr/commit/b03c1aed6b122133df6b011fa148e23150366e53
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ChangeLog
    M htdocs/commissions/index.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    R htdocs/includes/jquery/plugins/fileupload/cors/result.html
    M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
    M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/main.inc.php
    M htdocs/product/document.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Merge pull request #1 from Dolibarr/develop

Develop


  Commit: 4420684a39f0b7a82a403b88ee77aa207454ebe3
      
https://github.com/Dolibarr/dolibarr/commit/4420684a39f0b7a82a403b88ee77aa207454ebe3
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M dev/skeletons/modMyModule.class.php
    M htdocs/admin/fournisseur.php
    M htdocs/admin/project.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/liste.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_edison.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/doc/pdf_oursin.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_jaune.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/fiche.php
    R htdocs/includes/jquery/plugins/lightbox/css/jquery.lightbox-0.5.css
    R htdocs/includes/jquery/plugins/lightbox/images/lightbox-blank.gif
    R htdocs/includes/jquery/plugins/lightbox/images/lightbox-btn-close.gif
    R htdocs/includes/jquery/plugins/lightbox/images/lightbox-btn-next.gif
    R htdocs/includes/jquery/plugins/lightbox/images/lightbox-btn-prev.gif
    R htdocs/includes/jquery/plugins/lightbox/images/lightbox-ico-loading.gif
    R htdocs/includes/jquery/plugins/lightbox/js/jquery.lightbox-0.5.min.js
    R htdocs/includes/jquery/plugins/lightbox/js/jquery.lightbox-0.5.pack.js
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/es_ES/commercial.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Merge pull request #2 from Dolibarr/develop

Develop


  Commit: 44b84b21772b694f6293c3f26f956a55226aee58
      
https://github.com/Dolibarr/dolibarr/commit/44b84b21772b694f6293c3f26f956a55226aee58
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M ChangeLog
    A htdocs/core/modules/product/mod_codeproduct_elephant.php
    A htdocs/core/modules/product/mod_codeproduct_leopard.php
    A htdocs/core/modules/product/modules_product.class.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/product/admin/product.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  task # 326 : Add a numbering module to suggest automatically a product ref


  Commit: d0fbca4c37e65bd3d3a73fccfb4047f20ad9caf8
      
https://github.com/Dolibarr/dolibarr/commit/d0fbca4c37e65bd3d3a73fccfb4047f20ad9caf8
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/product/admin/product.php

  Log Message:
  -----------
  task # 326 : en_US translations :)


  Commit: d9955cc9af9c51fea869f6006fc7718c92ba3403
      
https://github.com/Dolibarr/dolibarr/commit/d9955cc9af9c51fea869f6006fc7718c92ba3403
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M ChangeLog
    A htdocs/core/modules/product/mod_codeproduct_elephant.php
    A htdocs/core/modules/product/mod_codeproduct_leopard.php
    A htdocs/core/modules/product/modules_product.class.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/product/admin/product.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge pull request #299 from atm-maxime/mko326

Everything looks ok with your push request. I merge it.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/32a1301a9257...d9955cc9af9c