[Dolibarr-git] [Dolibarr/dolibarr] 9c0fe6: Fix CR

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9c0fe61a214edfeecdf20ddafe5570dcde6e86d4
      
https://github.com/Dolibarr/dolibarr/commit/9c0fe61a214edfeecdf20ddafe5570dcde6e86d4
  Author: Marcos García <address@hidden>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  Fix CR


  Commit: e727100cf0da231d80b8f135b116f2a2c877d9f4
      
https://github.com/Dolibarr/dolibarr/commit/e727100cf0da231d80b8f135b116f2a2c877d9f4
  Author: Marcos García <address@hidden>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  New: Clone product/service composition


  Commit: 13bcb5daaa998ff962b0cc73df25fb95b4811860
      
https://github.com/Dolibarr/dolibarr/commit/13bcb5daaa998ff962b0cc73df25fb95b4811860
  Author: Marcos García <address@hidden>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    M dev/fixdosfiles.sh
    M dev/fixutf8bomfiles.sh
    A htdocs/admin/orderdet_extrafields.php
    M htdocs/cashdesk/css/style.css
    M htdocs/cashdesk/facturation.php
    R htdocs/cashdesk/img/bg_menu.png
    M htdocs/comm/action/fiche.php
    A htdocs/comm/admin/propaldet_extrafields.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/facture.php
    A htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    A htdocs/core/class/html.formcontract.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modPrintIPP.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/ecm/docmine.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/holiday/common.inc.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
    M htdocs/langs/ar_SA/agenda.lang
    M htdocs/langs/ar_SA/banks.lang
    M htdocs/langs/ca_ES/bookmarks.lang
    M htdocs/langs/ca_ES/ftp.lang
    M htdocs/langs/ca_ES/paybox.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/de_AT/banks.lang
    M htdocs/langs/de_AT/bills.lang
    M htdocs/langs/de_AT/bookmarks.lang
    M htdocs/langs/de_AT/boxes.lang
    M htdocs/langs/de_AT/categories.lang
    M htdocs/langs/de_AT/commercial.lang
    M htdocs/langs/de_AT/companies.lang
    M htdocs/langs/de_AT/compta.lang
    M htdocs/langs/de_AT/contracts.lang
    M htdocs/langs/de_AT/deliveries.lang
    M htdocs/langs/de_AT/dict.lang
    M htdocs/langs/de_AT/donations.lang
    M htdocs/langs/de_AT/ecm.lang
    M htdocs/langs/de_AT/errors.lang
    M htdocs/langs/de_AT/exports.lang
    M htdocs/langs/de_AT/ftp.lang
    M htdocs/langs/de_AT/help.lang
    M htdocs/langs/de_AT/install.lang
    M htdocs/langs/de_AT/interventions.lang
    M htdocs/langs/de_AT/languages.lang
    M htdocs/langs/de_AT/ldap.lang
    M htdocs/langs/de_AT/mails.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_AT/members.lang
    M htdocs/langs/de_AT/orders.lang
    M htdocs/langs/de_AT/oscommerce.lang
    M htdocs/langs/de_AT/other.lang
    M htdocs/langs/de_AT/paybox.lang
    M htdocs/langs/de_AT/paypal.lang
    M htdocs/langs/de_AT/products.lang
    M htdocs/langs/de_AT/projects.lang
    M htdocs/langs/de_AT/propal.lang
    M htdocs/langs/de_AT/sendings.lang
    M htdocs/langs/de_AT/shop.lang
    M htdocs/langs/de_AT/stocks.lang
    M htdocs/langs/de_AT/suppliers.lang
    M htdocs/langs/de_AT/trips.lang
    M htdocs/langs/de_AT/users.lang
    M htdocs/langs/de_AT/withdrawals.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    A htdocs/langs/en_US/printipp.lang
    M htdocs/langs/es_ES/bookmarks.lang
    M htdocs/langs/es_ES/ftp.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/bills.lang
    M htdocs/langs/es_MX/categories.lang
    M htdocs/langs/es_MX/companies.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/fa_IR/domains.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/cron.lang
    A htdocs/langs/fr_FR/printipp.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/agenda.lang
    M htdocs/langs/he_IL/banks.lang
    M htdocs/langs/he_IL/bills.lang
    M htdocs/langs/he_IL/bookmarks.lang
    M htdocs/langs/he_IL/boxes.lang
    M htdocs/langs/he_IL/cashdesk.lang
    M htdocs/langs/he_IL/categories.lang
    M htdocs/langs/he_IL/commercial.lang
    M htdocs/langs/he_IL/companies.lang
    M htdocs/langs/he_IL/compta.lang
    M htdocs/langs/he_IL/contracts.lang
    M htdocs/langs/he_IL/deliveries.lang
    M htdocs/langs/he_IL/dict.lang
    M htdocs/langs/he_IL/donations.lang
    M htdocs/langs/he_IL/ecm.lang
    M htdocs/langs/he_IL/errors.lang
    M htdocs/langs/he_IL/exports.lang
    M htdocs/langs/he_IL/externalsite.lang
    M htdocs/langs/he_IL/ftp.lang
    M htdocs/langs/he_IL/help.lang
    M htdocs/langs/he_IL/install.lang
    M htdocs/langs/he_IL/interventions.lang
    M htdocs/langs/he_IL/languages.lang
    M htdocs/langs/he_IL/ldap.lang
    M htdocs/langs/he_IL/mails.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/members.lang
    M htdocs/langs/he_IL/orders.lang
    M htdocs/langs/he_IL/oscommerce.lang
    M htdocs/langs/he_IL/other.lang
    M htdocs/langs/he_IL/paybox.lang
    M htdocs/langs/he_IL/paypal.lang
    M htdocs/langs/he_IL/products.lang
    M htdocs/langs/he_IL/projects.lang
    M htdocs/langs/he_IL/propal.lang
    M htdocs/langs/he_IL/sendings.lang
    M htdocs/langs/he_IL/shop.lang
    M htdocs/langs/he_IL/sms.lang
    M htdocs/langs/he_IL/stocks.lang
    M htdocs/langs/he_IL/suppliers.lang
    M htdocs/langs/he_IL/trips.lang
    M htdocs/langs/he_IL/users.lang
    M htdocs/langs/he_IL/withdrawals.lang
    M htdocs/langs/nl_BE/bookmarks.lang
    M htdocs/langs/nl_NL/agenda.lang
    M htdocs/langs/nl_NL/banks.lang
    M htdocs/langs/nl_NL/bookmarks.lang
    M htdocs/langs/nl_NL/boxes.lang
    M htdocs/langs/nl_NL/cashdesk.lang
    M htdocs/langs/nl_NL/commercial.lang
    M htdocs/langs/nl_NL/companies.lang
    M htdocs/langs/nl_NL/compta.lang
    M htdocs/langs/nl_NL/contracts.lang
    M htdocs/langs/nl_NL/donations.lang
    M htdocs/langs/nl_NL/errors.lang
    M htdocs/langs/nl_NL/exports.lang
    M htdocs/langs/nl_NL/externalsite.lang
    M htdocs/langs/nl_NL/install.lang
    M htdocs/langs/nl_NL/languages.lang
    M htdocs/langs/nl_NL/mails.lang
    M htdocs/langs/nl_NL/members.lang
    M htdocs/langs/nl_NL/orders.lang
    M htdocs/langs/nl_NL/paybox.lang
    M htdocs/langs/nl_NL/paypal.lang
    M htdocs/langs/nl_NL/projects.lang
    M htdocs/langs/nl_NL/sms.lang
    M htdocs/langs/nl_NL/stocks.lang
    M htdocs/langs/nl_NL/suppliers.lang
    M htdocs/langs/nl_NL/trips.lang
    M htdocs/langs/nl_NL/users.lang
    M htdocs/langs/nl_NL/withdrawals.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/donations.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/google.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/oscommerce.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/ru_UA/banks.lang
    M htdocs/langs/ru_UA/bookmarks.lang
    M htdocs/langs/ru_UA/compta.lang
    M htdocs/langs/ru_UA/contracts.lang
    M htdocs/langs/ru_UA/dict.lang
    M htdocs/langs/ru_UA/ecm.lang
    M htdocs/langs/ru_UA/ftp.lang
    M htdocs/langs/ru_UA/install.lang
    M htdocs/langs/ru_UA/interventions.lang
    M htdocs/langs/ru_UA/mails.lang
    M htdocs/langs/ru_UA/main.lang
    M htdocs/langs/ru_UA/other.lang
    M htdocs/langs/ru_UA/paybox.lang
    M htdocs/langs/ru_UA/paypal.lang
    M htdocs/langs/ru_UA/shop.lang
    M htdocs/langs/ru_UA/users.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mailmanspip.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/margins.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang
    M htdocs/main.inc.php
    M htdocs/printipp/admin/printipp.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/fiche.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/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 test/README
    M test/phpunit/phpunittest.xml

  Log Message:
  -----------
  Merge branch 'develop' into clone-composition

Conflicts:
        ChangeLog
        htdocs/core/modules/facture/doc/pdf_crabe.modules.php


  Commit: febe74ad17981d8965c080bfaf0dd33b71e819f4
      
https://github.com/Dolibarr/dolibarr/commit/febe74ad17981d8965c080bfaf0dd33b71e819f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge pull request #1038 from marcosgdf/clone-composition

Clone composition


Compare: 
https://github.com/Dolibarr/dolibarr/compare/93c71d00f7ab...febe74ad1798