[Dolibarr-git] [Dolibarr/dolibarr] 9d8438: Minor fix on remisecheque display

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9d8438ecdd2a70831a1c3ca883bda504e3c306a3
      
https://github.com/Dolibarr/dolibarr/commit/9d8438ecdd2a70831a1c3ca883bda504e3c306a3
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M htdocs/compta/paiement/fiche.php

  Log Message:
  -----------
  Minor fix on remisecheque display


  Commit: fc8805f2cab6f8164e93cee4ecc937b118118666
      
https://github.com/Dolibarr/dolibarr/commit/fc8805f2cab6f8164e93cee4ecc937b118118666
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M htdocs/expedition/fiche.php
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  Added missing trad on shipment + display calculated weight after true weight


  Commit: 00aded09bb1b84e3d791b071de52a6f95248e3df
      
https://github.com/Dolibarr/dolibarr/commit/00aded09bb1b84e3d791b071de52a6f95248e3df
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Fix : shipment prices not related to qty shipped


  Commit: 7c24686532287746b14b9f671eed81379895edc1
      
https://github.com/Dolibarr/dolibarr/commit/7c24686532287746b14b9f671eed81379895edc1
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

  Log Message:
  -----------
  Add good vars for odt generation


  Commit: bef913cc2f8d12493546653972cbdf635704d156
      
https://github.com/Dolibarr/dolibarr/commit/bef913cc2f8d12493546653972cbdf635704d156
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: 27e26c872ec7d66d241c040cc0657d3e306ff64f
      
https://github.com/Dolibarr/dolibarr/commit/27e26c872ec7d66d241c040cc0657d3e306ff64f
  Author: Geoffrey <address@hidden(none)>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ChangeLog
    M build/debian/README.howto
    M build/debian/control
    M htdocs/admin/livraison.php
    M htdocs/admin/propal.php
    M htdocs/categories/categorie.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/apercu.php
    M htdocs/comm/propal/contact.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/propal/note.php
    M htdocs/comm/prospect/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/apercu.php
    M htdocs/commande/contact.php
    M htdocs/commande/fiche.php
    M htdocs/commande/index.php
    M htdocs/commande/note.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/index.php
    M htdocs/compta/localtax/reglement.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/paiement/cheque/fiche.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/quadri.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
    M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/index.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/boxes/box_graph_orders_permonth.php
    M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/shipment.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/fiche.php
    M htdocs/index.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_bordereau_cheque.sql
    M htdocs/install/repair.php
    M htdocs/install/upgrade.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/product/fiche.php
    M htdocs/projet/admin/project.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/home.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Conflicts:
        ChangeLog


  Commit: fbdb764d4144303f808ab25a323c9042c7ae6623
      
https://github.com/Dolibarr/dolibarr/commit/fbdb764d4144303f808ab25a323c9042c7ae6623
  Author: Juanjo Menent <address@hidden>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement/fiche.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  Merge pull request #1113 from atm-maxime/develop

Work on shipment


Compare: 
https://github.com/Dolibarr/dolibarr/compare/22b8fcfe63b8...fbdb764d4144