[Dolibarr-git] [Dolibarr/dolibarr] e6f9c5: Fix odt as PDF generation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e6f9c567d98ca05ff3ebeba1f05d4a47e83ba7e3
      
https://github.com/Dolibarr/dolibarr/commit/e6f9c567d98ca05ff3ebeba1f05d4a47e83ba7e3
  Author: fhenry <address@hidden>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M htdocs/includes/odtphp/odf.php
    M htdocs/includes/odtphp/odt2pdf.sh

  Log Message:
  -----------
  Fix odt as PDF generation


  Commit: ee4839c92ed0ba2983936690b0394c9cd885c159
      
https://github.com/Dolibarr/dolibarr/commit/ee4839c92ed0ba2983936690b0394c9cd885c159
  Author: fhenry <address@hidden>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/includes/odtphp/odt2pdf.sh

  Log Message:
  -----------
  Better management for ODT to PDF


  Commit: 3fdc57cc561e29744665b53d743b5d8d67dd2887
      
https://github.com/Dolibarr/dolibarr/commit/3fdc57cc561e29744665b53d743b5d8d67dd2887
  Author: fhenry <address@hidden>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M ChangeLog
    M dev/skeletons/modMyModule.class.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/agenda.php
    A htdocs/admin/agenda_other.php
    M htdocs/admin/dict.php
    M htdocs/admin/menus/edit.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/sociales/document.php
    A htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docdir.php
    M htdocs/expedition/fiche.php
    M htdocs/externalsite/frames.php
    M htdocs/externalsite/frametop.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/fiche.php
    M htdocs/holiday/index.php
    A htdocs/install/doctemplates/thirdparties/template_thirdparty.ods
    M htdocs/install/etape1.php
    M htdocs/install/etape2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/externalsite.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/commercial.lang
    M htdocs/langs/es_ES/externalsite.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/commercial.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/externalsite.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/fiche.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/class/societe.class.php
    M htdocs/theme/amarok/graph-color.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: 0513cbe655885339065430188db0cce221f9de27
      
https://github.com/Dolibarr/dolibarr/commit/0513cbe655885339065430188db0cce221f9de27
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/comm/list.php
    M htdocs/product/liste.php

  Log Message:
  -----------
  Add debug log (dol_syslog)


  Commit: bd1b440743d9f2620d57332652e1d659928118c7
      
https://github.com/Dolibarr/dolibarr/commit/bd1b440743d9f2620d57332652e1d659928118c7
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M build/debian/README.howto
    M build/debian/changelog
    M build/debian/po/fr.po
    M build/debian/po/templates.pot
    M build/debian/rules
    M build/launchpad/README
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    M build/perl/virtualmin/dolibarr.pl
    M dev/skeletons/modMyModule.class.php
    M htdocs/admin/boxes.php
    M htdocs/admin/dict.php
    M htdocs/admin/triggers.php
    M htdocs/core/ajax/box.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_external_rss.php
    A htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    R htdocs/core/tpl/triggers.tpl.php
    M htdocs/document.php
    M htdocs/filefunc.inc.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_boxes.key.sql
    M htdocs/install/mysql/tables/llx_boxes.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/externalsite.lang
    M htdocs/langs/nl_NL/bills.lang
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/server_other.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M test/phpunit/DateLibTest.php

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


  Commit: d9a2805100223dc0b4fe95cd340466f3a4cf512b
      
https://github.com/Dolibarr/dolibarr/commit/d9a2805100223dc0b4fe95cd340466f3a4cf512b
  Author: fhenry <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/fr_FR/boxes.lang
    M htdocs/societe/soc.php
    M htdocs/theme/amarok/img/warning.png
    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/fiche.php
    M htdocs/user/param_ihm.php

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


  Commit: 41c8a9aa6a40f6bbba919c5a8e04f867b02d6f95
      
https://github.com/Dolibarr/dolibarr/commit/41c8a9aa6a40f6bbba919c5a8e04f867b02d6f95
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/fr_FR/users.lang
    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/user/fiche.php

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


  Commit: 9ce7e44f006bbe5e1c3c119b3f29dd6df66ef42c
      
https://github.com/Dolibarr/dolibarr/commit/9ce7e44f006bbe5e1c3c119b3f29dd6df66ef42c
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  use price method rather than price2num. price are use in all PDF, so it
should be the same on ODT


  Commit: d9551abb70fcb1cfde64d4b6f86c993d87defd89
      
https://github.com/Dolibarr/dolibarr/commit/d9551abb70fcb1cfde64d4b6f86c993d87defd89
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  Fix trad for Extrafield from table


  Commit: 5789a5d6e939109471e249a607e46bd2f95ca159
      
https://github.com/Dolibarr/dolibarr/commit/5789a5d6e939109471e249a607e46bd2f95ca159
  Author: fhenry <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M build/rpm/README
    M build/rpm/install.forced.php.generic
    M build/rpm/install.forced.php.opensuse
    M htdocs/core/class/html.form.class.php
    M htdocs/install/etape1.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/errors.lang
    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

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


  Commit: f67bf0eef2e215a8fdf9729d37597ff93436bf50
      
https://github.com/Dolibarr/dolibarr/commit/f67bf0eef2e215a8fdf9729d37597ff93436bf50
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M htdocs/comm/list.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/includes/odtphp/odt2pdf.sh
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/liste.php

  Log Message:
  -----------
  Merge pull request #873 from FHenry/develop

Add debug script and better ODT error management


Compare: 
https://github.com/Dolibarr/dolibarr/compare/74e7dc319dfd...f67bf0eef2e2