dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 3730d8: Fix: [ bug #991 ] Error when


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 3730d8: Fix: [ bug #991 ] Error when adding a product in P...
Date: Sat, 24 Aug 2013 13:41:51 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3730d874c92b2801b426a4596439b51cf4aaf3f1
      
https://github.com/Dolibarr/dolibarr/commit/3730d874c92b2801b426a4596439b51cf4aaf3f1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
associated to the country of the company


  Commit: 784c8acaf7d541966b616c907e30aa4b4249af81
      
https://github.com/Dolibarr/dolibarr/commit/784c8acaf7d541966b616c907e30aa4b4249af81
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/agenda.lang
    M htdocs/langs/el_GR/banks.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/bookmarks.lang
    M htdocs/langs/el_GR/boxes.lang
    M htdocs/langs/el_GR/cashdesk.lang
    M htdocs/langs/el_GR/categories.lang
    M htdocs/langs/el_GR/commercial.lang
    A htdocs/langs/el_GR/commissions.lang
    M htdocs/langs/el_GR/companies.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/contracts.lang
    A htdocs/langs/el_GR/cron.lang
    M htdocs/langs/el_GR/deliveries.lang
    M htdocs/langs/el_GR/dict.lang
    M htdocs/langs/el_GR/donations.lang
    M htdocs/langs/el_GR/ecm.lang
    M htdocs/langs/el_GR/errors.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/externalsite.lang
    M htdocs/langs/el_GR/ftp.lang
    M htdocs/langs/el_GR/help.lang
    A htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/install.lang
    M htdocs/langs/el_GR/interventions.lang
    M htdocs/langs/el_GR/languages.lang
    M htdocs/langs/el_GR/ldap.lang
    A htdocs/langs/el_GR/mailmanspip.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/main.lang
    A htdocs/langs/el_GR/margins.lang
    M htdocs/langs/el_GR/members.lang
    A htdocs/langs/el_GR/opensurvey.lang
    M htdocs/langs/el_GR/orders.lang
    M htdocs/langs/el_GR/oscommerce.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/paybox.lang
    M htdocs/langs/el_GR/paypal.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/propal.lang
    M htdocs/langs/el_GR/sendings.lang
    M htdocs/langs/el_GR/shop.lang
    M htdocs/langs/el_GR/sms.lang
    M htdocs/langs/el_GR/stocks.lang
    M htdocs/langs/el_GR/suppliers.lang
    M htdocs/langs/el_GR/trips.lang
    M htdocs/langs/el_GR/users.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/langs/el_GR/workflow.lang

  Log Message:
  -----------
  Trans: Upgrade language file


  Commit: 04caccc5f31ce7c86ea8b2b09e31c44585429929
      
https://github.com/Dolibarr/dolibarr/commit/04caccc5f31ce7c86ea8b2b09e31c44585429929
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    A dev/fixperms.sh

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


  Commit: afae841ae492f71e18f377e30d52cdce1f72a025
      
https://github.com/Dolibarr/dolibarr/commit/afae841ae492f71e18f377e30d52cdce1f72a025
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    A Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php
    R Mail/PEAR.php b/htdocs/includes/nusoap/lib/Mail/PEAR.php
    A Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php
    R Mail/RFC822.php b/htdocs/includes/nusoap/lib/Mail/RFC822.php
    R Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php
    A Mail/mail.php b/htdocs/includes/nusoap/lib/Mail/mail.php
    A Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
    R Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
    R Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    A Mail/mimeDecode.php b/htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    R Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
    A Mail/mimePart.php b/htdocs/includes/nusoap/lib/Mail/mimePart.php
    R Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php
    A Mail/null.php b/htdocs/includes/nusoap/lib/Mail/null.php
    R Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php
    A Mail/sendmail.php b/htdocs/includes/nusoap/lib/Mail/sendmail.php
    A Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php
    R Mail/smtp.php b/htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/adherents/admin/adherent_extrafields.php
    A htdocs/adherents/admin/adherent_extrafields.php
    A htdocs/adherents/admin/public.php
    R htdocs/adherents/admin/public.php
    R htdocs/adherents/cartes/carte.php
    A htdocs/adherents/cartes/carte.php
    R htdocs/adherents/class/adherentstats.class.php
    A htdocs/adherents/class/adherentstats.class.php
    A htdocs/adherents/stats/byproperties.php
    R htdocs/adherents/stats/byproperties.php
    R htdocs/adherents/stats/geo.php
    A htdocs/adherents/stats/geo.php
    R htdocs/admin/pdf.php
    A htdocs/admin/pdf.php
    A htdocs/admin/proxy.php
    R htdocs/admin/proxy.php
    R htdocs/admin/sms.php
    A htdocs/admin/sms.php
    A htdocs/admin/system/xcache.php
    R htdocs/admin/system/xcache.php
    A htdocs/admin/translation.php
    R htdocs/admin/translation.php
    R htdocs/admin/workflow.php
    A htdocs/admin/workflow.php
    A htdocs/comm/action/document.php
    R htdocs/comm/action/document.php
    R htdocs/comm/admin/propal_extrafields.php
    A htdocs/comm/admin/propal_extrafields.php
    A htdocs/comm/list.php
    R htdocs/comm/list.php
    A htdocs/comm/prospect/list.php
    R htdocs/comm/prospect/list.php
    R htdocs/commande/customer.php
    A htdocs/commande/customer.php
    R htdocs/commande/orderstoinvoice.php
    A htdocs/commande/orderstoinvoice.php
    A htdocs/compta/deplacement/list.php
    R htdocs/compta/deplacement/list.php
    A htdocs/compta/deplacement/stats/index.php
    R htdocs/compta/deplacement/stats/index.php
    R htdocs/compta/journal/purchasesjournal.php
    A htdocs/compta/journal/purchasesjournal.php
    R htdocs/compta/journal/sellsjournal.php
    A htdocs/compta/journal/sellsjournal.php
    A htdocs/compta/paiement_charge.php
    R htdocs/compta/paiement_charge.php
    A htdocs/contact/list.php
    R htdocs/contact/list.php
    A htdocs/core/boxes/box_contacts.php
    R htdocs/core/boxes/box_contacts.php
    R htdocs/core/boxes/box_members.php
    A htdocs/core/boxes/box_members.php
    R htdocs/core/class/CSMSFile.class.php
    A htdocs/core/class/CSMSFile.class.php
    A htdocs/core/class/commondocgenerator.class.php
    R htdocs/core/class/commondocgenerator.class.php
    A htdocs/core/class/extrafields.class.php
    R htdocs/core/class/extrafields.class.php
    R htdocs/core/class/genericobject.class.php
    A htdocs/core/class/genericobject.class.php
    A htdocs/core/class/hookmanager.class.php
    R htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/rssparser.class.php
    A htdocs/core/class/rssparser.class.php
    R htdocs/core/class/smtps.class.php
    A htdocs/core/class/smtps.class.php
    A htdocs/core/class/vcard.class.php
    R htdocs/core/class/vcard.class.php
    R htdocs/core/filemanagerdol/browser/default/browser.php
    A htdocs/core/filemanagerdol/browser/default/browser.php
    A htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
    R htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
    A htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    R htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
    A htdocs/core/filemanagerdol/browser/default/frmfolders.php
    R htdocs/core/filemanagerdol/browser/default/frmfolders.php
    R htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
    A htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
    R htdocs/core/filemanagerdol/browser/default/frmupload.php
    A htdocs/core/filemanagerdol/browser/default/frmupload.php
    R htdocs/core/filemanagerdol/connectors/php/basexml.php
    A htdocs/core/filemanagerdol/connectors/php/basexml.php
    A htdocs/core/filemanagerdol/connectors/php/commands.php
    R htdocs/core/filemanagerdol/connectors/php/commands.php
    A htdocs/core/filemanagerdol/connectors/php/config.php
    R htdocs/core/filemanagerdol/connectors/php/config.php
    A htdocs/core/filemanagerdol/connectors/php/connector.php
    R htdocs/core/filemanagerdol/connectors/php/connector.php
    A htdocs/core/filemanagerdol/connectors/php/io.php
    R htdocs/core/filemanagerdol/connectors/php/io.php
    R htdocs/core/filemanagerdol/connectors/php/upload.php
    A htdocs/core/filemanagerdol/connectors/php/upload.php
    R htdocs/core/filemanagerdol/connectors/php/util.php
    A htdocs/core/filemanagerdol/connectors/php/util.php
    A htdocs/core/modules/contract/mod_contract_magre.php
    R htdocs/core/modules/contract/mod_contract_magre.php
    R htdocs/core/modules/contract/mod_contract_serpis.php
    A htdocs/core/modules/contract/mod_contract_serpis.php
    A htdocs/core/modules/contract/modules_contract.php
    R htdocs/core/modules/contract/modules_contract.php
    R htdocs/core/modules/expedition/mod_expedition_ribera.php
    A htdocs/core/modules/expedition/mod_expedition_ribera.php
    A htdocs/core/modules/expedition/mod_expedition_safor.php
    R htdocs/core/modules/expedition/mod_expedition_safor.php
    R htdocs/core/modules/export/export_excel2007.modules.php
    A htdocs/core/modules/export/export_excel2007.modules.php
    R htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    A htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    A htdocs/core/modules/mailings/contacts1.modules.php
    R htdocs/core/modules/mailings/contacts1.modules.php
    A htdocs/core/modules/mailings/contacts2.modules.php
    R htdocs/core/modules/mailings/contacts2.modules.php
    A htdocs/core/modules/mailings/contacts3.modules.php
    R htdocs/core/modules/mailings/contacts3.modules.php
    A htdocs/core/modules/mailings/thirdparties.modules.php
    R htdocs/core/modules/mailings/thirdparties.modules.php
    R htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    A htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    R htdocs/core/modules/modOpenSurvey.class.php
    A htdocs/core/modules/modOpenSurvey.class.php
    R htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    A htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    A htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    R htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    A htdocs/core/tools.php
    R htdocs/core/tools.php
    R htdocs/core/triggers/interface_20_all_Logevents.class.php
    A htdocs/core/triggers/interface_20_all_Logevents.class.php
    R htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    A htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    A htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    R htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    A htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    R htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    R htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    A htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    A htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/fichinter/list.php
    A htdocs/fichinter/list.php
    R htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    A htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    A htdocs/filefunc.inc.php
    R htdocs/filefunc.inc.php
    A htdocs/fourn/commande/index.php
    R htdocs/fourn/commande/index.php
    R htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    A htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    R htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    A htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    A htdocs/includes/fpdfi/filters/FilterASCII85.php
    R htdocs/includes/fpdfi/filters/FilterASCII85.php
    A htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
    R htdocs/includes/fpdfi/filters/FilterASCII85_FPDI.php
    R htdocs/includes/fpdfi/filters/FilterLZW.php
    A htdocs/includes/fpdfi/filters/FilterLZW.php
    R htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
    A htdocs/includes/fpdfi/filters/FilterLZW_FPDI.php
    A htdocs/includes/fpdfi/fpdf_tpl.php
    R htdocs/includes/fpdfi/fpdf_tpl.php
    R htdocs/includes/fpdfi/fpdi.php
    A htdocs/includes/fpdfi/fpdi.php
    R htdocs/includes/fpdfi/fpdi2tcpdf_bridge.php
    A htdocs/includes/fpdfi/fpdi2tcpdf_bridge.php
    A htdocs/includes/fpdfi/fpdi_pdf_parser.php
    R htdocs/includes/fpdfi/fpdi_pdf_parser.php
    A htdocs/includes/fpdfi/pdf_context.php
    R htdocs/includes/fpdfi/pdf_context.php
    A htdocs/includes/fpdfi/pdf_parser.php
    R htdocs/includes/fpdfi/pdf_parser.php
    R 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
    A 
htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.php
    R htdocs/includes/tcpdf/config/lang/afr.php
    A htdocs/includes/tcpdf/config/lang/afr.php
    R htdocs/includes/tcpdf/config/lang/ara.php
    A htdocs/includes/tcpdf/config/lang/ara.php
    A htdocs/includes/tcpdf/config/lang/aze.php
    R htdocs/includes/tcpdf/config/lang/aze.php
    R htdocs/includes/tcpdf/config/lang/bel.php
    A htdocs/includes/tcpdf/config/lang/bel.php
    A htdocs/includes/tcpdf/config/lang/cat.php
    R htdocs/includes/tcpdf/config/lang/cat.php
    R htdocs/includes/tcpdf/config/lang/ces.php
    A htdocs/includes/tcpdf/config/lang/ces.php
    R htdocs/includes/tcpdf/config/lang/chi.php
    A htdocs/includes/tcpdf/config/lang/chi.php
    A htdocs/includes/tcpdf/config/lang/cym.php
    R htdocs/includes/tcpdf/config/lang/cym.php
    A htdocs/includes/tcpdf/config/lang/dan.php
    R htdocs/includes/tcpdf/config/lang/dan.php
    A htdocs/includes/tcpdf/config/lang/est.php
    R htdocs/includes/tcpdf/config/lang/est.php
    A htdocs/includes/tcpdf/config/lang/eus.php
    R htdocs/includes/tcpdf/config/lang/eus.php
    A htdocs/includes/tcpdf/config/lang/fra.php
    R htdocs/includes/tcpdf/config/lang/fra.php
    R htdocs/includes/tcpdf/config/lang/gle.php
    A htdocs/includes/tcpdf/config/lang/gle.php
    R htdocs/includes/tcpdf/config/lang/glg.php
    A htdocs/includes/tcpdf/config/lang/glg.php
    A htdocs/includes/tcpdf/config/lang/hat.php
    R htdocs/includes/tcpdf/config/lang/hat.php
    A htdocs/includes/tcpdf/config/lang/heb.php
    R htdocs/includes/tcpdf/config/lang/heb.php
    R htdocs/includes/tcpdf/config/lang/hrv.php
    A htdocs/includes/tcpdf/config/lang/hrv.php
    R htdocs/includes/tcpdf/config/lang/hun.php
    A htdocs/includes/tcpdf/config/lang/hun.php
    A htdocs/includes/tcpdf/config/lang/hye.php
    R htdocs/includes/tcpdf/config/lang/hye.php
    A htdocs/includes/tcpdf/config/lang/ind.php
    R htdocs/includes/tcpdf/config/lang/ind.php
    R htdocs/includes/tcpdf/config/lang/kat.php
    A htdocs/includes/tcpdf/config/lang/kat.php
    R htdocs/includes/tcpdf/config/lang/kor.php
    A htdocs/includes/tcpdf/config/lang/kor.php
    A htdocs/includes/tcpdf/config/lang/mkd.php
    R htdocs/includes/tcpdf/config/lang/mkd.php
    A htdocs/includes/tcpdf/config/lang/mlt.php
    R htdocs/includes/tcpdf/config/lang/mlt.php
    R htdocs/includes/tcpdf/config/lang/msa.php
    A htdocs/includes/tcpdf/config/lang/msa.php
    R htdocs/includes/tcpdf/config/lang/nld.php
    A htdocs/includes/tcpdf/config/lang/nld.php
    R htdocs/includes/tcpdf/config/lang/nob.php
    A htdocs/includes/tcpdf/config/lang/nob.php
    R htdocs/includes/tcpdf/config/lang/pol.php
    A htdocs/includes/tcpdf/config/lang/pol.php
    A htdocs/includes/tcpdf/config/lang/por.php
    R htdocs/includes/tcpdf/config/lang/por.php
    R htdocs/includes/tcpdf/config/lang/ron.php
    A htdocs/includes/tcpdf/config/lang/ron.php
    R htdocs/includes/tcpdf/config/lang/rus.php
    A htdocs/includes/tcpdf/config/lang/rus.php
    R htdocs/includes/tcpdf/config/lang/slv.php
    A htdocs/includes/tcpdf/config/lang/slv.php
    A htdocs/includes/tcpdf/config/lang/spa.php
    R htdocs/includes/tcpdf/config/lang/spa.php
    R htdocs/includes/tcpdf/config/lang/sqi.php
    A htdocs/includes/tcpdf/config/lang/sqi.php
    A htdocs/includes/tcpdf/config/lang/srp.php
    R htdocs/includes/tcpdf/config/lang/srp.php
    A htdocs/includes/tcpdf/config/lang/swa.php
    R htdocs/includes/tcpdf/config/lang/swa.php
    A htdocs/includes/tcpdf/config/lang/swe.php
    R htdocs/includes/tcpdf/config/lang/swe.php
    R htdocs/includes/tcpdf/config/lang/urd.php
    A htdocs/includes/tcpdf/config/lang/urd.php
    A htdocs/includes/tcpdf/config/lang/yid.php
    R htdocs/includes/tcpdf/config/lang/yid.php
    R htdocs/includes/tcpdf/config/lang/zho.php
    A htdocs/includes/tcpdf/config/lang/zho.php
    A htdocs/opensurvey/admin/index.php
    R htdocs/opensurvey/admin/index.php
    A htdocs/opensurvey/adminstuds.php
    R htdocs/opensurvey/adminstuds.php
    A htdocs/opensurvey/adminstuds_preview.php
    R htdocs/opensurvey/adminstuds_preview.php
    R htdocs/opensurvey/fonctions.php
    A htdocs/opensurvey/fonctions.php
    A htdocs/opensurvey/index.php
    R htdocs/opensurvey/index.php
    R htdocs/opensurvey/list.php
    A htdocs/opensurvey/list.php
    R htdocs/opensurvey/public/choix_autre.php
    A htdocs/opensurvey/public/choix_autre.php
    A htdocs/opensurvey/public/choix_date.php
    R htdocs/opensurvey/public/choix_date.php
    R htdocs/opensurvey/public/create_survey.php
    A htdocs/opensurvey/public/create_survey.php
    R htdocs/opensurvey/public/exportcsv.php
    A htdocs/opensurvey/public/exportcsv.php
    R htdocs/opensurvey/public/index.php
    A htdocs/opensurvey/public/index.php
    A htdocs/opensurvey/public/studs.php
    R htdocs/opensurvey/public/studs.php
    R htdocs/product/admin/product_extrafields.php
    A htdocs/product/admin/product_extrafields.php
    R htdocs/product/canvas/product/actions_card_product.class.php
    A htdocs/product/canvas/product/actions_card_product.class.php
    R htdocs/product/canvas/product/index.php
    A htdocs/product/canvas/product/index.php
    R htdocs/product/canvas/product/tpl/card_create.tpl.php
    A htdocs/product/canvas/product/tpl/card_create.tpl.php
    R htdocs/product/canvas/product/tpl/card_edit.tpl.php
    A htdocs/product/canvas/product/tpl/card_edit.tpl.php
    A htdocs/product/canvas/product/tpl/card_view.tpl.php
    R htdocs/product/canvas/product/tpl/card_view.tpl.php
    A htdocs/product/canvas/product/tpl/index.php
    R htdocs/product/canvas/product/tpl/index.php
    R htdocs/product/canvas/product/tpl/list.tpl.php
    A htdocs/product/canvas/product/tpl/list.tpl.php
    R htdocs/product/canvas/service/actions_card_service.class.php
    A htdocs/product/canvas/service/actions_card_service.class.php
    A htdocs/product/canvas/service/tpl/card_create.tpl.php
    R htdocs/product/canvas/service/tpl/card_create.tpl.php
    R htdocs/product/canvas/service/tpl/card_edit.tpl.php
    A htdocs/product/canvas/service/tpl/card_edit.tpl.php
    A htdocs/product/canvas/service/tpl/card_view.tpl.php
    R htdocs/product/canvas/service/tpl/card_view.tpl.php
    A htdocs/product/document.php
    R htdocs/product/document.php
    A htdocs/projet/admin/project_extrafields.php
    R htdocs/projet/admin/project_extrafields.php
    R htdocs/public/paypal/index.php
    A htdocs/public/paypal/index.php
    R htdocs/public/paypal/newpayment.php
    A htdocs/public/paypal/newpayment.php
    A htdocs/public/paypal/paymentko.php
    R htdocs/public/paypal/paymentko.php
    A htdocs/public/paypal/paymentok.php
    R htdocs/public/paypal/paymentok.php
    A htdocs/societe/admin/contact_extrafields.php
    R htdocs/societe/admin/contact_extrafields.php
    R htdocs/societe/admin/societe_extrafields.php
    A htdocs/societe/admin/societe_extrafields.php
    R htdocs/theme/amarok/graph-color.php
    A htdocs/theme/amarok/graph-color.php
    R htdocs/theme/amarok/index.php
    A htdocs/theme/amarok/index.php
    A htdocs/theme/amarok/style.css.php
    R htdocs/theme/amarok/style.css.php
    A htdocs/theme/amarok/tpl/index.php
    R htdocs/theme/amarok/tpl/index.php
    A htdocs/theme/auguria/graph-color.php
    R htdocs/theme/auguria/graph-color.php
    A htdocs/webservices/server_category.php
    R htdocs/webservices/server_category.php
    R htdocs/webservices/server_invoice.php
    A htdocs/webservices/server_invoice.php
    A htdocs/webservices/server_productorservice.php
    R htdocs/webservices/server_productorservice.php
    R htdocs/webservices/server_supplier_invoice.php
    A htdocs/webservices/server_supplier_invoice.php
    R htdocs/webservices/server_thirdparty.php
    A htdocs/webservices/server_thirdparty.php
    R import.lib.php b/htdocs/core/lib/import.lib.php
    A import.lib.php b/htdocs/core/lib/import.lib.php
    A paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
    R paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
    R paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
    A paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
    R paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
    A paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
    A scripts/company/export-contacts-xls-example.php
    R scripts/company/export-contacts-xls-example.php
    A scripts/company/sync_contacts_dolibarr2ldap.php
    R scripts/company/sync_contacts_dolibarr2ldap.php
    A scripts/withdrawals/build_withdrawal_file.php
    R scripts/withdrawals/build_withdrawal_file.php
    A ws.lib.php b/htdocs/core/lib/ws.lib.php
    R ws.lib.php b/htdocs/core/lib/ws.lib.php

  Log Message:
  -----------
  Fix: Permissions on files


  Commit: c3dd7c3b3996fde610ce486644bf549649b0ca59
      
https://github.com/Dolibarr/dolibarr/commit/c3dd7c3b3996fde610ce486644bf549649b0ca59
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modDeplacement.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php

  Log Message:
  -----------
  Fix: Tons of regression after renaming note field into note_private.


  Commit: 4346a3f90f2a861055a10fd8d46f483f90558421
      
https://github.com/Dolibarr/dolibarr/commit/4346a3f90f2a861055a10fd8d46f483f90558421
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: Param must be a regex string

Conflicts:
        htdocs/core/class/html.formfile.class.php


  Commit: f57aaf4f4a9744450acbdc67950961ea578f452c
      
https://github.com/Dolibarr/dolibarr/commit/f57aaf4f4a9744450acbdc67950961ea578f452c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/expedition/shipment.php

  Log Message:
  -----------
  Fix: Do not load class like it should


  Commit: 23516a466c372a7c80a86c827768ddf3ad452672
      
https://github.com/Dolibarr/dolibarr/commit/23516a466c372a7c80a86c827768ddf3ad452672
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/fiche-rec.php

  Log Message:
  -----------
  Fix: Pb with predefined invoices


  Commit: 0f867550333842ed1eac789b06b6ce75efbb5da7
      
https://github.com/Dolibarr/dolibarr/commit/0f867550333842ed1eac789b06b6ce75efbb5da7
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fix: Found a dozen of bugs into sub module delivery of module shipment.

Conflicts:
        htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
        htdocs/expedition/class/expedition.class.php
        htdocs/expedition/fiche.php


  Commit: b9e1a57f678af6aa6eb4fde6990d20e40638dde0
      
https://github.com/Dolibarr/dolibarr/commit/b9e1a57f678af6aa6eb4fde6990d20e40638dde0
  Author: simnandez <address@hidden>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/supplier_invoice.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Fix: [ bug #1029 ] Tulip numbering mask


  Commit: 75701ee99595b37c76688f7390df3c7650a74ff0
      
https://github.com/Dolibarr/dolibarr/commit/75701ee99595b37c76688f7390df3c7650a74ff0
  Author: Florian Henry <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix: Supplier invoice and supplier order are not displayed into object
link into agenda event card


  Commit: e56ef31cfb16873bc9f7c10ded57b7f03c49ca37
      
https://github.com/Dolibarr/dolibarr/commit/e56ef31cfb16873bc9f7c10ded57b7f03c49ca37
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #1174 from FHenry/3.4

Fix: Supplier invoice and supplier order are not displayed into object


  Commit: ba58ab153bf673341bb7edc0ece801ebb8a991e3
      
https://github.com/Dolibarr/dolibarr/commit/ba58ab153bf673341bb7edc0ece801ebb8a991e3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: 34987d3e8b2802d814f33dd9bb85c1f788f6351f
      
https://github.com/Dolibarr/dolibarr/commit/34987d3e8b2802d814f33dd9bb85c1f788f6351f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M htdocs/conf/.gitignore

  Log Message:
  -----------
  Exclude conf.php file from git


  Commit: 26d1352de4ee29f9a0c3b2bb9abd78efa5b1d36d
      
https://github.com/Dolibarr/dolibarr/commit/26d1352de4ee29f9a0c3b2bb9abd78efa5b1d36d
  Author: Florian Henry <address@hidden>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix update extrafield do not display immediatly


  Commit: 067c8c55b9fc52351c82e97e5699c5ba1452d1a3
      
https://github.com/Dolibarr/dolibarr/commit/067c8c55b9fc52351c82e97e5699c5ba1452d1a3
  Author: simnandez <address@hidden>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: [ bug #1033 ] SUPPLIER REF disappeared


  Commit: da565b2c7f5e7b1c409265c8ea9ff076dc0adc1f
      
https://github.com/Dolibarr/dolibarr/commit/da565b2c7f5e7b1c409265c8ea9ff076dc0adc1f
  Author: Florian Henry <address@hidden>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M htdocs/societe/canvas/company/tpl/card_create.tpl.php
    M htdocs/societe/canvas/company/tpl/card_edit.tpl.php

  Log Message:
  -----------
  

Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7


  Commit: 5fcbd2d14fa59404da6bb70011225d2258b0fe92
      
https://github.com/Dolibarr/dolibarr/commit/5fcbd2d14fa59404da6bb70011225d2258b0fe92
  Author: Florian Henry <address@hidden>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix Bug with canvas


  Commit: d6c7ac5f73b97145ace577fe9cea928846d6519c
      
https://github.com/Dolibarr/dolibarr/commit/d6c7ac5f73b97145ace577fe9cea928846d6519c
  Author: Florian Henry <address@hidden>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M htdocs/societe/canvas/company/tpl/card_create.tpl.php
    M htdocs/societe/canvas/company/tpl/card_edit.tpl.php

  Log Message:
  -----------
  Fix canvas feature broken


  Commit: 60b3f61339236b452088419015a03be3e6fa3a60
      
https://github.com/Dolibarr/dolibarr/commit/60b3f61339236b452088419015a03be3e6fa3a60
  Author: Florian Henry <address@hidden>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

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

Conflicts:
        ChangeLog


  Commit: 6b0e52192008265ea3380ec7fd549e2076e7beef
      
https://github.com/Dolibarr/dolibarr/commit/6b0e52192008265ea3380ec7fd549e2076e7beef
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/societe/canvas/company/tpl/card_create.tpl.php
    M htdocs/societe/canvas/company/tpl/card_edit.tpl.php

  Log Message:
  -----------
  Merge pull request #1177 from FHenry/3.4

Fix update extrafield do not display immediatly


  Commit: 49e38e1263a4d637f9cee967e80372899817ce36
      
https://github.com/Dolibarr/dolibarr/commit/49e38e1263a4d637f9cee967e80372899817ce36
  Author: Grand Philippe <address@hidden>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  fix some trad


  Commit: 4e34e7b71c3d51ba62de2679b082e6d75e4efd96
      
https://github.com/Dolibarr/dolibarr/commit/4e34e7b71c3d51ba62de2679b082e6d75e4efd96
  Author: simnandez <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/product/stats/facture_fournisseur.php

  Log Message:
  -----------
  Fix: [ bug #1037 ] Consumption> Supplier invoices related


  Commit: 9ac22149d4930f31ae08ae4238d87ab75528cc91
      
https://github.com/Dolibarr/dolibarr/commit/9ac22149d4930f31ae08ae4238d87ab75528cc91
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/fourn/product/liste.php

  Log Message:
  -----------
  fix old bug on reordering supplier products in list


  Commit: b6d998d1c55fb70c6dfcc1c89252fc3cd536074e
      
https://github.com/Dolibarr/dolibarr/commit/b6d998d1c55fb70c6dfcc1c89252fc3cd536074e
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/fourn/product/liste.php

  Log Message:
  -----------
  Merge pull request #1185 from altatof/3.4

fix old bug on reordering supplier products in list


  Commit: ba4fde20ce1baf820804a7c1dd75ca5f3312dbfc
      
https://github.com/Dolibarr/dolibarr/commit/ba4fde20ce1baf820804a7c1dd75ca5f3312dbfc
  Author: Florian Henry <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/fiche.php

  Log Message:
  -----------
  Fix UserGroup name not display in card view or edit


  Commit: 71ec4ea31ccbf5d8e806eedc98800085039efb2c
      
https://github.com/Dolibarr/dolibarr/commit/71ec4ea31ccbf5d8e806eedc98800085039efb2c
  Author: Florian Henry <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/product/liste.php
    M htdocs/product/stats/facture_fournisseur.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.4

Conflicts:
        ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d


  Commit: 7e27b9f2214f4a76e62c2e13a76c3b40a14dc6ab
      
https://github.com/Dolibarr/dolibarr/commit/7e27b9f2214f4a76e62c2e13a76c3b40a14dc6ab
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/group/fiche.php

  Log Message:
  -----------
  Merge pull request #1186 from FHenry/3.4

Fix UserGroup name not display in card view or edit


  Commit: dd32dbacb5dff2ffddaf56155aea00b76ea1bff3
      
https://github.com/Dolibarr/dolibarr/commit/dd32dbacb5dff2ffddaf56155aea00b76ea1bff3
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Fix retrieving of margin info when invoice created automatically from order 
(used by workflow module)


  Commit: 5ca7820884e56fae765b12e9f3355af518f414a0
      
https://github.com/Dolibarr/dolibarr/commit/5ca7820884e56fae765b12e9f3355af518f414a0
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Merge pull request #1187 from altatof/3.4

Fix retrieving of margin info when invoice created automatically from order.


  Commit: dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
      
https://github.com/Dolibarr/dolibarr/commit/dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge pull request #1181 from grandoc/3.3

fix some trad


  Commit: 05040d19979bedd2d55d9f1868ebb840f58625e6
      
https://github.com/Dolibarr/dolibarr/commit/05040d19979bedd2d55d9f1868ebb840f58625e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/core/modules/mailings/contacts3.modules.php

  Log Message:
  -----------
  Fix: B1032-develop: Problem in the filter of Contact by company category


  Commit: 32dd1e448083b1307000c43f6152bef4eb11d6a9
      
https://github.com/Dolibarr/dolibarr/commit/32dd1e448083b1307000c43f6152bef4eb11d6a9
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M htdocs/fourn/ajax/getSupplierPrices.php

  Log Message:
  -----------
  fix display of buying price on line edit when no supplier price is defined


  Commit: e00f02616d43d5da391703d0ac88002761089d16
      
https://github.com/Dolibarr/dolibarr/commit/e00f02616d43d5da391703d0ac88002761089d16
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update changelog


  Commit: 4f991da8463759340ec991f2b807a6bb5d6f72fa
      
https://github.com/Dolibarr/dolibarr/commit/4f991da8463759340ec991f2b807a6bb5d6f72fa
  Author: Florian Henry <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/fiche.php

  Log Message:
  -----------
  Fix: Link "Show all supplier invoice" on suplier card not working


  Commit: 37e3455f82056cac68c54234ea9f5a39e81db76c
      
https://github.com/Dolibarr/dolibarr/commit/37e3455f82056cac68c54234ea9f5a39e81db76c
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/fiche.php

  Log Message:
  -----------
  Merge pull request #1191 from FHenry/3.4

Fix: Link "Show all supplier invoice" on suplier card not working


  Commit: ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
      
https://github.com/Dolibarr/dolibarr/commit/ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/fiche.php

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


  Commit: edf7af444c346bed6c911b6fbe17dcf20a39ee87
      
https://github.com/Dolibarr/dolibarr/commit/edf7af444c346bed6c911b6fbe17dcf20a39ee87
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  fix margin reports bugs (wrong group by + jquery syntax error)


  Commit: 7e61c3703a7f4a5bdcfeaa032c48d386574c8452
      
https://github.com/Dolibarr/dolibarr/commit/7e61c3703a7f4a5bdcfeaa032c48d386574c8452
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/ajax/getSupplierPrices.php

  Log Message:
  -----------
  Merge pull request #1189 from altairis-fr/3.4

fix display of buying price on line edit when no supplier price is defined


  Commit: 2e79e750e96604058ae936fb2f8b4c20f4c16b9b
      
https://github.com/Dolibarr/dolibarr/commit/2e79e750e96604058ae936fb2f8b4c20f4c16b9b
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

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


  Commit: 20d349689d0bdbc28434294a3dc050ee773bef26
      
https://github.com/Dolibarr/dolibarr/commit/20d349689d0bdbc28434294a3dc050ee773bef26
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge pull request #1192 from altairis-fr/3.4

fix margin reports bugs (wrong group by + jquery syntax error)


  Commit: c242d665300e1eb3e6890d2684b2f2bc2b0faf81
      
https://github.com/Dolibarr/dolibarr/commit/c242d665300e1eb3e6890d2684b2f2bc2b0faf81
  Author: simnandez <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/fiche-rec.php

  Log Message:
  -----------
  Fix: [ bug #1039 ] Pre-defined invoices conversion


  Commit: 1c527b8db9a61031e37f28558d5c958094e3930b
      
https://github.com/Dolibarr/dolibarr/commit/1c527b8db9a61031e37f28558d5c958094e3930b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/conf/.gitignore
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: 1c08cad6b9cd02e3df6d6317b50386f9033a40ee
      
https://github.com/Dolibarr/dolibarr/commit/1c08cad6b9cd02e3df6d6317b50386f9033a40ee
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  Fix: Bad translation (to pick to 3.4)

Conflicts:
        htdocs/langs/en_US/main.lang
        htdocs/langs/fr_FR/main.lang


  Commit: cafd75ac4ab7620e945ed6bd2dbad00457ebf529
      
https://github.com/Dolibarr/dolibarr/commit/cafd75ac4ab7620e945ed6bd2dbad00457ebf529
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/fourn/fiche.php

  Log Message:
  -----------
  Revert a bad fix.


  Commit: 8c90ad8afa8fc1804ed17a303fef149d1e9f8047
      
https://github.com/Dolibarr/dolibarr/commit/8c90ad8afa8fc1804ed17a303fef149d1e9f8047
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/conf/.gitignore
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/fiche.php
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/banks.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/boxes.lang
    M htdocs/langs/el_GR/categories.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/contracts.lang
    M htdocs/langs/el_GR/cron.lang
    M htdocs/langs/el_GR/donations.lang
    M htdocs/langs/el_GR/ecm.lang
    M htdocs/langs/el_GR/errors.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/help.lang
    M htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/install.lang
    M htdocs/langs/el_GR/interventions.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/margins.lang
    M htdocs/langs/el_GR/members.lang
    M htdocs/langs/el_GR/opensurvey.lang
    M htdocs/langs/el_GR/orders.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/paybox.lang
    M htdocs/langs/el_GR/paypal.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/propal.lang
    M htdocs/langs/el_GR/sendings.lang
    M htdocs/langs/el_GR/stocks.lang
    M htdocs/langs/el_GR/suppliers.lang
    M htdocs/langs/el_GR/users.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/livraison/fiche.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/product/tpl/card_edit.tpl.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
        ChangeLog
        htdocs/core/class/commonobject.class.php
        htdocs/core/class/html.formfile.class.php
        htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/core/modules/modFacture.class.php
        htdocs/core/modules/modFournisseur.class.php
        htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
        htdocs/expedition/fiche.php
        htdocs/fourn/fiche.php
        htdocs/langs/el_GR/admin.lang
        htdocs/langs/el_GR/agenda.lang
        htdocs/langs/el_GR/banks.lang
        htdocs/langs/el_GR/bills.lang
        htdocs/langs/el_GR/bookmarks.lang
        htdocs/langs/el_GR/boxes.lang
        htdocs/langs/el_GR/cashdesk.lang
        htdocs/langs/el_GR/categories.lang
        htdocs/langs/el_GR/commercial.lang
        htdocs/langs/el_GR/companies.lang
        htdocs/langs/el_GR/compta.lang
        htdocs/langs/el_GR/contracts.lang
        htdocs/langs/el_GR/cron.lang
        htdocs/langs/el_GR/deliveries.lang
        htdocs/langs/el_GR/dict.lang
        htdocs/langs/el_GR/donations.lang
        htdocs/langs/el_GR/ecm.lang
        htdocs/langs/el_GR/errors.lang
        htdocs/langs/el_GR/exports.lang
        htdocs/langs/el_GR/externalsite.lang
        htdocs/langs/el_GR/ftp.lang
        htdocs/langs/el_GR/help.lang
        htdocs/langs/el_GR/holiday.lang
        htdocs/langs/el_GR/install.lang
        htdocs/langs/el_GR/interventions.lang
        htdocs/langs/el_GR/languages.lang
        htdocs/langs/el_GR/ldap.lang
        htdocs/langs/el_GR/mailmanspip.lang
        htdocs/langs/el_GR/mails.lang
        htdocs/langs/el_GR/main.lang
        htdocs/langs/el_GR/margins.lang
        htdocs/langs/el_GR/members.lang
        htdocs/langs/el_GR/opensurvey.lang
        htdocs/langs/el_GR/orders.lang
        htdocs/langs/el_GR/oscommerce.lang
        htdocs/langs/el_GR/other.lang
        htdocs/langs/el_GR/paybox.lang
        htdocs/langs/el_GR/paypal.lang
        htdocs/langs/el_GR/products.lang
        htdocs/langs/el_GR/projects.lang
        htdocs/langs/el_GR/propal.lang
        htdocs/langs/el_GR/sendings.lang
        htdocs/langs/el_GR/shop.lang
        htdocs/langs/el_GR/sms.lang
        htdocs/langs/el_GR/stocks.lang
        htdocs/langs/el_GR/suppliers.lang
        htdocs/langs/el_GR/trips.lang
        htdocs/langs/el_GR/users.lang
        htdocs/langs/el_GR/withdrawals.lang
        htdocs/langs/el_GR/workflow.lang
        htdocs/margin/productMargins.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6d2c27beec53...8c90ad8afa8f

reply via email to

[Prev in Thread] Current Thread [Next in Thread]