[Dolibarr-git] [Dolibarr/dolibarr] 3fd2a6: Merge branch 'develop' of ssh://address@hidden/Dol...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 3fd2a621f0c95c4d01338a46fdb8b559ba6d8d6c
      
https://github.com/Dolibarr/dolibarr/commit/3fd2a621f0c95c4d01338a46fdb8b559ba6d8d6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
  M htdocs/comm/propal/class/propal.class.php
  M htdocs/commande/class/commande.class.php
  M htdocs/compta/facture/class/facture.class.php
  M htdocs/compta/prelevement/class/bon-prelevement.class.php
  M htdocs/core/class/commonobject.class.php
  M htdocs/core/class/html.form.class.php
  M htdocs/core/lib/company.lib.php
  M htdocs/core/lib/pdf.lib.php
  M htdocs/core/lib/usergroups.lib.php
  M htdocs/core/menus/standard/empty.php
  M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
  M htdocs/ftp/pre.inc.php
  M htdocs/langs/pt_PT/projects.lang
  M htdocs/product/canvas/service/actions_card_service.class.php
  M htdocs/societe/class/societe.class.php
  M test/phpunit/SocieteTest.php

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


  Commit: 31f198fa795b214b11b5f8e194328ae8d82d556b
      
https://github.com/Dolibarr/dolibarr/commit/31f198fa795b214b11b5f8e194328ae8d82d556b
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M dev/examples/create_invoice.php
  M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Clean invoice class from deprecated fields.
Enhance initAsSpeciment function to contains all kind of lines.


  Commit: 839781dfbe431a8156d099dd62c571a1114ff830
      
https://github.com/Dolibarr/dolibarr/commit/839781dfbe431a8156d099dd62c571a1114ff830
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M htdocs/adherents/card_subscriptions.php
  M htdocs/cashdesk/tpl/facturation1.tpl.php
  M htdocs/cashdesk/tpl/liste_articles.tpl.php
  M htdocs/cashdesk/tpl/ticket.tpl.php
  M htdocs/cashdesk/tpl/validation1.tpl.php
  M htdocs/cashdesk/validation_verif.php
  M htdocs/comm/addpropal.php
  M htdocs/comm/fiche.php
  M htdocs/comm/propal.php
  M htdocs/comm/propal/apercu.php
  M htdocs/comm/propal/note.php
  M htdocs/comm/remx.php
  M htdocs/commande/apercu.php
  M htdocs/commande/fiche.php
  M htdocs/compta/bank/bankid_fr.php
  M htdocs/compta/bank/fiche.php
  M htdocs/compta/bank/ligne.php
  M htdocs/compta/bank/virement.php
  M htdocs/compta/dons/fiche.php
  M htdocs/compta/facture.php
  M htdocs/compta/facture/apercu.php
  M htdocs/compta/facture/fiche-rec.php
  M htdocs/compta/facture/prelevement.php
  M htdocs/compta/paiement.php
  M htdocs/compta/paiement/fiche.php
  M htdocs/compta/paiement_charge.php
  M htdocs/compta/payment_sc/fiche.php
  M htdocs/compta/prelevement/create.php
  M htdocs/compta/propal.php
  M htdocs/compta/sociales/charges.php
  M htdocs/compta/stats/prev.php
  M htdocs/contrat/contact.php
  M htdocs/contrat/fiche.php
  M htdocs/contrat/note.php
  M htdocs/core/boxes/box_comptes.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/class/html.form.class.php
  M htdocs/core/class/smtps.class.php
  M htdocs/core/lib/pdf.lib.php
  M htdocs/core/modules/commande/pdf_edison.modules.php
  M htdocs/core/modules/commande/pdf_einstein.modules.php
  M htdocs/core/modules/dons/html_cerfafr.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/propale/pdf_propale_azur.modules.php
  M htdocs/core/modules/propale/pdf_propale_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/shipment.php
  M htdocs/fourn/commande/fiche.php
  M htdocs/fourn/facture/fiche.php
  M htdocs/fourn/paiement/fiche.php
  M htdocs/paybox/lib/paybox.lib.php
  M htdocs/paypal/lib/paypal.lib.php
  M htdocs/product/stock/valo.php
  M htdocs/public/donations/donateurs_code.php
  M htdocs/public/members/new.php
  M htdocs/public/paybox/newpayment.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/company/tpl/card_view.tpl.php
  M htdocs/societe/lien.php
  M htdocs/societe/soc.php

  Log Message:
  -----------
  Qual: Removed a TODO by renaming all ->monnaie into ->currency


Compare: https://github.com/Dolibarr/dolibarr/compare/a6119fb...839781d