[Dolibarr-git] [Dolibarr/dolibarr] 48072c: Fix bug 1588 : relative discount not working anymo...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 48072c58d796789edbdfca6091c00d0eb7e8b913
      
https://github.com/Dolibarr/dolibarr/commit/48072c58d796789edbdfca6091c00d0eb7e8b913
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Fix bug 1588 : relative discount not working anymore


  Commit: 386f4bd82e6906b4b85e36e1f296f19822b5988a
      
https://github.com/Dolibarr/dolibarr/commit/386f4bd82e6906b4b85e36e1f296f19822b5988a
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M build/debian/changelog
    M build/debian/control
    M build/debian/copyright
    M build/debian/dolibarr.postinst
    M build/debian/get-orig-source.sh
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    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 dev/initdata/mysqldump_dolibarr_3.1.0.sql
    M dev/initdata/mysqldump_dolibarr_3.2.0.sql
    M dev/initdata/mysqldump_dolibarr_3.3.0.sql
    M dev/initdata/mysqldump_dolibarr_3.4.0.sql
    M dev/initdata/mysqldump_dolibarr_3.5.0.sql
    M dev/initdata/mysqldump_dolibarr_3.6.0.sql
    M htdocs/.gitignore
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/commande.php
    M htdocs/admin/dict.php
    M htdocs/admin/facture.php
    M htdocs/admin/ldap_groups.php
    M htdocs/admin/limits.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/other.php
    M htdocs/admin/stock.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/dbtable.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/system/index.php
    M htdocs/admin/tools/eaccelerator.php
    M htdocs/admin/tools/purge.php
    M htdocs/admin/tools/update.php
    M htdocs/admin/translation.php
    M htdocs/admin/workflow.php
    M htdocs/cashdesk/affContenu.php
    M htdocs/cashdesk/affIndex.php
    M htdocs/cashdesk/facturation.php
    M htdocs/cashdesk/index.php
    M htdocs/cashdesk/tpl/menu.tpl.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/customer.php
    M htdocs/commande/fiche.php
    M htdocs/commande/info.php
    M htdocs/commande/liste.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/paiement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/charges.php
    M htdocs/compta/tva/fiche.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/canvas/default/actions_contactcard_default.class.php
    M htdocs/contact/info.php
    M htdocs/contact/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/info.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/actions_setnotes.inc.php
    M htdocs/core/ajax/ziptown.php
    M htdocs/core/class/canvas.class.php
    M htdocs/core/class/commonobject.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.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/class/link.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/db/DoliDB.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/js/lib_head.js
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/holiday.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/lib/trip.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/lib/ws.lib.php
    M htdocs/core/login/functions_empty.php
    M htdocs/core/login/functions_forceuser.php
    M htdocs/core/login/functions_http.php
    M htdocs/core/login/functions_ldap.php
    M htdocs/core/login/functions_openid.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/product/mod_codeproduct_leopard.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/societe/mod_codeclient_elephant.php
    M htdocs/core/modules/societe/mod_codeclient_leopard.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.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/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/exports/export.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/fiche.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/fiche.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/index.php
    M htdocs/holiday/view_log.php
    M htdocs/imports/import.php
    M htdocs/includes/ckeditor/contents.css
    M htdocs/includes/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tcpdf/README.TXT
    M htdocs/includes/tcpdf/composer.json
    M htdocs/includes/tcpdf/config/tcpdf_config.php
    R htdocs/includes/tcpdf/fonts/aealarabiya.ctg.z
    R htdocs/includes/tcpdf/fonts/aealarabiya.z
    R htdocs/includes/tcpdf/fonts/aefurat.ctg.z
    R htdocs/includes/tcpdf/fonts/aefurat.z
    M htdocs/includes/tcpdf/fonts/cid0cs.php
    M htdocs/includes/tcpdf/fonts/cid0ct.php
    M htdocs/includes/tcpdf/fonts/cid0jp.php
    M htdocs/includes/tcpdf/fonts/cid0kr.php
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
    M htdocs/includes/tcpdf/fonts/dejavusans.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusans.php
    M htdocs/includes/tcpdf/fonts/dejavusans.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.php
    M htdocs/includes/tcpdf/fonts/dejavusansb.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.php
    M htdocs/includes/tcpdf/fonts/dejavusansbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansi.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
    R htdocs/includes/tcpdf/fonts/dejavuserifi.z
    R htdocs/includes/tcpdf/fonts/freefont-20100919/AUTHORS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/COPYING
    R htdocs/includes/tcpdf/fonts/freefont-20100919/CREDITS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/ChangeLog
    R htdocs/includes/tcpdf/fonts/freefont-20100919/INSTALL
    R htdocs/includes/tcpdf/fonts/freefont-20100919/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/AUTHORS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/CREDITS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/ChangeLog
    A htdocs/includes/tcpdf/fonts/freefont-20120503/INSTALL
    A htdocs/includes/tcpdf/fonts/freefont-20120503/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/USAGE
    M htdocs/includes/tcpdf/fonts/freemono.ctg.z
    M htdocs/includes/tcpdf/fonts/freemono.php
    M htdocs/includes/tcpdf/fonts/freemono.z
    M htdocs/includes/tcpdf/fonts/freemonob.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonob.php
    M htdocs/includes/tcpdf/fonts/freemonob.z
    M htdocs/includes/tcpdf/fonts/freemonobi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonobi.php
    M htdocs/includes/tcpdf/fonts/freemonobi.z
    M htdocs/includes/tcpdf/fonts/freemonoi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonoi.php
    M htdocs/includes/tcpdf/fonts/freemonoi.z
    M htdocs/includes/tcpdf/include/barcodes/datamatrix.php
    M htdocs/includes/tcpdf/include/barcodes/pdf417.php
    M htdocs/includes/tcpdf/include/sRGB.icc
    M htdocs/includes/tcpdf/include/tcpdf_colors.php
    M htdocs/includes/tcpdf/include/tcpdf_filters.php
    M htdocs/includes/tcpdf/include/tcpdf_font_data.php
    M htdocs/includes/tcpdf/include/tcpdf_fonts.php
    M htdocs/includes/tcpdf/include/tcpdf_images.php
    M htdocs/includes/tcpdf/include/tcpdf_static.php
    M htdocs/includes/tcpdf/tcpdf.php
    M htdocs/includes/tcpdf/tcpdf_autoconfig.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_1d.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_2d.php
    M htdocs/includes/tcpdf/tcpdf_import.php
    M htdocs/includes/tcpdf/tcpdf_parser.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql
    A htdocs/langs/ar_SA/link.lang
    M htdocs/langs/bg_BG/companies.lang
    M htdocs/langs/bg_BG/languages.lang
    A htdocs/langs/bg_BG/link.lang
    A htdocs/langs/bs_BA/link.lang
    M htdocs/langs/ca_ES/link.lang
    A htdocs/langs/cs_CZ/link.lang
    A htdocs/langs/da_DK/link.lang
    A htdocs/langs/de_DE/link.lang
    A htdocs/langs/el_GR/link.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/dict.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/link.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/et_EE/install.lang
    A htdocs/langs/et_EE/link.lang
    A htdocs/langs/eu_ES/link.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/agenda.lang
    M htdocs/langs/fa_IR/commercial.lang
    M htdocs/langs/fa_IR/companies.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/contracts.lang
    M htdocs/langs/fa_IR/errors.lang
    M htdocs/langs/fa_IR/exports.lang
    M htdocs/langs/fa_IR/languages.lang
    A htdocs/langs/fa_IR/link.lang
    M htdocs/langs/fa_IR/mails.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fa_IR/shop.lang
    M htdocs/langs/fa_IR/stocks.lang
    M htdocs/langs/fa_IR/users.lang
    A htdocs/langs/fi_FI/link.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/link.lang
    M htdocs/langs/fr_FR/resource.lang
    A htdocs/langs/he_IL/link.lang
    A htdocs/langs/hr_HR/link.lang
    A htdocs/langs/hu_HU/link.lang
    A htdocs/langs/id_ID/link.lang
    A htdocs/langs/is_IS/link.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/agenda.lang
    M htdocs/langs/it_IT/bills.lang
    M htdocs/langs/it_IT/boxes.lang
    M htdocs/langs/it_IT/cashdesk.lang
    M htdocs/langs/it_IT/categories.lang
    M htdocs/langs/it_IT/commercial.lang
    M htdocs/langs/it_IT/companies.lang
    M htdocs/langs/it_IT/contracts.lang
    M htdocs/langs/it_IT/deliveries.lang
    M htdocs/langs/it_IT/ecm.lang
    M htdocs/langs/it_IT/install.lang
    M htdocs/langs/it_IT/interventions.lang
    M htdocs/langs/it_IT/languages.lang
    A htdocs/langs/it_IT/link.lang
    M htdocs/langs/it_IT/mails.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/it_IT/margins.lang
    M htdocs/langs/it_IT/opensurvey.lang
    M htdocs/langs/it_IT/orders.lang
    M htdocs/langs/it_IT/other.lang
    M htdocs/langs/it_IT/paybox.lang
    M htdocs/langs/it_IT/paypal.lang
    M htdocs/langs/it_IT/shop.lang
    M htdocs/langs/it_IT/stocks.lang
    M htdocs/langs/it_IT/users.lang
    M htdocs/langs/it_IT/withdrawals.lang
    A htdocs/langs/ja_JP/link.lang
    A htdocs/langs/ko_KR/link.lang
    A htdocs/langs/lt_LT/link.lang
    M htdocs/langs/lv_LV/link.lang
    A htdocs/langs/mk_MK/link.lang
    A htdocs/langs/nb_NO/link.lang
    A htdocs/langs/nl_NL/link.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/errors.lang
    A htdocs/langs/pl_PL/link.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.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/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/externalsite.lang
    M htdocs/langs/pt_BR/ftp.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    A htdocs/langs/pt_BR/link.lang
    M htdocs/langs/pt_BR/mailmanspip.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.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/paypal.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/salaries.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_BR/sms.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/pt_BR/withdrawals.lang
    M htdocs/langs/pt_BR/workflow.lang
    A htdocs/langs/pt_PT/link.lang
    M htdocs/langs/ro_RO/agenda.lang
    A htdocs/langs/ro_RO/link.lang
    A htdocs/langs/ru_RU/link.lang
    M htdocs/langs/sk_SK/link.lang
    A htdocs/langs/sl_SI/link.lang
    A htdocs/langs/sq_AL/link.lang
    A htdocs/langs/sv_SE/link.lang
    A htdocs/langs/th_TH/link.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/bills.lang
    A htdocs/langs/tr_TR/link.lang
    M htdocs/langs/tr_TR/propal.lang
    A htdocs/langs/uk_UA/link.lang
    A htdocs/langs/vi_VN/link.lang
    A htdocs/langs/zh_CN/link.lang
    A htdocs/langs/zh_TW/link.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/main.inc.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/fonctions.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php
    M htdocs/printipp/admin/printipp.php
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/document.php
    M htdocs/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/activity/list.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/fiche.php
    M htdocs/projet/index.php
    M htdocs/projet/tasks/index.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/ajaxcompanies.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/canvas/company/actions_card_company.class.php
    M htdocs/societe/canvas/individual/actions_card_individual.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/price.php
    M htdocs/societe/soc.php
    A htdocs/theme/amarok/img/object_address.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/graph-color.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/group/ldap.php
    M htdocs/user/param_ihm.php
    M htdocs/webservices/server_category.php
    M htdocs/webservices/server_invoice.php
    M test/phpunit/CommandeFournisseurTest.php
    M test/phpunit/CommandeTest.php
    M test/phpunit/CommonObjectTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/EntrepotTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureRecTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FunctionsLibTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/SocieteTest.php
    M test/phpunit/SqlTest.php
    M test/phpunit/UserTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesThirdpartyTest.php

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


  Commit: 4fd67d725ab2d634dc0a1f66f3a508a158eabbbf
      
https://github.com/Dolibarr/dolibarr/commit/4fd67d725ab2d634dc0a1f66f3a508a158eabbbf
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Fix bug 1588 : relative discount not working anymore


  Commit: ec974cae263b61c243ba6221e95c907f168b6ba2
      
https://github.com/Dolibarr/dolibarr/commit/ec974cae263b61c243ba6221e95c907f168b6ba2
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Log Message:
  -----------
  Merge branch '3.6' of github.com:atm-maxime/dolibarr into 3.6


  Commit: dad1e312ab4861569009bc61f2c508f56779ad63
      
https://github.com/Dolibarr/dolibarr/commit/dad1e312ab4861569009bc61f2c508f56779ad63
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Merge pull request #1939 from atm-maxime/3.6

Fix bug 1588 : relative discount


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc63e8b9dca2...dad1e312ab48