[Dolibarr-git] [Dolibarr/dolibarr] b8a84d: add messages

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b8a84d68ec87d88f6f3a203bb314c180332a2f87
      
https://github.com/Dolibarr/dolibarr/commit/b8a84d68ec87d88f6f3a203bb314c180332a2f87
  Author: frederic34 <address@hidden>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/orders.lang

  Log Message:
  -----------
  add messages


  Commit: 01d4bd6cf5543c5175337ec2cd234fbeea3fdf89
      
https://github.com/Dolibarr/dolibarr/commit/01d4bd6cf5543c5175337ec2cd234fbeea3fdf89
  Author: frederic34 <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  bad invert


  Commit: cd738ef4838a81664fba8f7fc560f826e251f3cd
      
https://github.com/Dolibarr/dolibarr/commit/cd738ef4838a81664fba8f7fc560f826e251f3cd
  Author: frederic34 <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M README-FR.md
    M README.md
    M build/debian/README.howto
    M composer.lock
    R dev/initdata/generate-commande.php
    R dev/initdata/generate-facture.php
    A dev/initdata/generate-invoice.php
    A dev/initdata/generate-order.php
    A dev/initdata/generate-product.php
    R dev/initdata/generate-produit.php
    R dev/initdata/generate-propale.php
    A dev/initdata/generate-proposal.php
    R dev/initdata/generate-societe.php
    A dev/initdata/generate-thirdparty.php
    M dev/initdata/sftpget_and_loaddump.php
    M dev/skeletons/build_class_from_table.php
    M dev/skeletons/skeleton_card.php
    M dev/skeletons/skeleton_list.php
    M htdocs/admin/barcode.php
    M htdocs/admin/dict.php
    M htdocs/admin/facture.php
    M htdocs/admin/oauth.php
    M htdocs/admin/payment.php
    M htdocs/admin/security.php
    M htdocs/categories/edit.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/address.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/contact.php
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/contact.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/bank/graph.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/contact/list.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/doc.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/modules/import/modules_import.php
    M htdocs/core/modules/modOauth.class.php
    M htdocs/core/modules/oauth/getgoogleoauthcallback.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/exports/class/export.class.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/class/employee.class.php
    M htdocs/hrm/class/establishment.class.php
    M htdocs/hrm/employee/list.php
    M htdocs/hrm/establishment/card.php
    M htdocs/hrm/establishment/info.php
    M htdocs/includes/OAuth/Common/Storage/DoliStorage.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_budget.sql
    M htdocs/install/mysql/tables/llx_budget_lines.key.sql
    M htdocs/install/mysql/tables/llx_budget_lines.sql
    A htdocs/install/mysql/tables/llx_categorie_project.key.sql
    A htdocs/install/mysql/tables/llx_categorie_project.sql
    M htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/install/mysql/tables/llx_user_param.sql
    M htdocs/langs/en_US/oauth.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/main.inc.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/printing/admin/printing.php
    M htdocs/printing/index.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/list.php
    M htdocs/product/popuprop.php
    M htdocs/product/price.php
    M htdocs/product/stats/card.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/product/traduction.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/list.php
    M htdocs/user/card.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge remote branch 'upstream/develop' into fccard

Conflicts:
        htdocs/commande/card.php


  Commit: 9ee06e8f0d74c412299afa5dafdc1898d4653293
      
https://github.com/Dolibarr/dolibarr/commit/9ee06e8f0d74c412299afa5dafdc1898d4653293
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/orders.lang

  Log Message:
  -----------
  Merge pull request #3951 from frederic34/fccard

add messages


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f6a95975078a...9ee06e8f0d74