[Dolibarr-git] [Dolibarr/dolibarr] 0d1ab7: Merge branch 'develop' of htt

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0d1ab7: Merge branch 'develop' of htt

From:	Juanjo Menent
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 0d1ab7: Merge branch 'develop' of https://github.com/Dolib...
Date:	Tue, 16 Jul 2013 23:47:57 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0d1ab71b05504d65c388a8fc005a2de7ef7b0f2f
      
https://github.com/Dolibarr/dolibarr/commit/0d1ab71b05504d65c388a8fc005a2de7ef7b0f2f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-13 (Sat, 13 Jul 2013)

  Changed paths:
    M ChangeLog
    M build/debian/control
    M htdocs/admin/geoipmaxmind.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/files.lib.php
    M htdocs/master.inc.php
    M htdocs/paypal/admin/paypal.php

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


  Commit: 6c79247a4b2c15902cb927a83ccd4bc1fd1396b3
      
https://github.com/Dolibarr/dolibarr/commit/6c79247a4b2c15902cb927a83ccd4bc1fd1396b3
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-13 (Sat, 13 Jul 2013)

  Changed paths:
    A dev/initdata/generate-commande.php
    R dev/initdata/generate-commande.php
    R dev/initdata/generate-facture.php
    A dev/initdata/generate-facture.php
    A dev/initdata/generate-produit.php
    R dev/initdata/generate-produit.php
    R dev/initdata/generate-propale.php
    A dev/initdata/generate-propale.php
    A dev/initdata/generate-societe.php
    R dev/initdata/generate-societe.php
    A htdocs/admin/pdf.php
    R htdocs/admin/pdf.php
    R htdocs/admin/proxy.php
    A htdocs/admin/proxy.php
    R htdocs/admin/sms.php
    A htdocs/admin/sms.php
    M htdocs/admin/system/perf.php
    A htdocs/admin/translation.php
    R htdocs/admin/translation.php
    A htdocs/admin/workflow.php
    R htdocs/admin/workflow.php
    A htdocs/core/class/CSMSFile.class.php
    R htdocs/core/class/CSMSFile.class.php
    R htdocs/core/class/commondocgenerator.class.php
    A htdocs/core/class/commondocgenerator.class.php
    A htdocs/core/class/extrafields.class.php
    R htdocs/core/class/extrafields.class.php
    A htdocs/core/class/genericobject.class.php
    R htdocs/core/class/genericobject.class.php
    R htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/hookmanager.class.php
    R htdocs/core/class/html.formsms.class.php
    A 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
    R htdocs/core/class/vcard.class.php
    A htdocs/core/class/vcard.class.php
    A htdocs/core/triggers/interface_20_all_Logevents.class.php
    R htdocs/core/triggers/interface_20_all_Logevents.class.php
    A htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    R htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    R htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    A 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
    A htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    R 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/core/triggers/interface_90_all_Demo.class.php-NORUN
    A htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    A htdocs/filefunc.inc.php
    R htdocs/filefunc.inc.php
    R htdocs/fourn/commande/index.php
    A htdocs/fourn/commande/index.php

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


  Commit: 91e598398d9696a0fbca34308c8ce41346ef439f
      
https://github.com/Dolibarr/dolibarr/commit/91e598398d9696a0fbca34308c8ce41346ef439f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-13 (Sat, 13 Jul 2013)

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


  Commit: 4fd1b5364e390c8026b22ff07002c23c8fd963ad
      
https://github.com/Dolibarr/dolibarr/commit/4fd1b5364e390c8026b22ff07002c23c8fd963ad
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/ecm/index.php
    M htdocs/fourn/class/fournisseur.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/index.php
    M htdocs/fourn/facture/note.php
    M scripts/bank/export-bank-receipts.php
    M scripts/company/export-contacts-xls-example.php
    M scripts/company/sync_contacts_dolibarr2ldap.php
    M scripts/contracts/email_expire_services_to_customers.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M scripts/invoices/rebuild_merge_pdf.php
    M scripts/members/sync_members_dolibarr2ldap.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_groups_dolibarr2ldap.php
    M scripts/user/sync_groups_ldap2dolibarr.php
    M scripts/user/sync_users_dolibarr2ldap.php
    M scripts/user/sync_users_ldap2dolibarr.php
    M scripts/withdrawals/build_withdrawal_file.php
    M test/phpunit/DateLibTest.php

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


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

  Changed paths:
    M ChangeLog
    M htdocs/admin/expedition.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/conf/conf.php.example
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice2.lib.php
    M htdocs/core/lib/pdf.lib.php
    A htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    R htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    R htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    A htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    A htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/expedition/fiche.php
    A htdocs/install/doctemplates/shipment/template_shipment.odt
    M htdocs/master.inc.php
    M scripts/invoices/rebuild_merge_pdf.php

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


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

  Changed paths:
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php

  Log Message:
  -----------
  Fix : link to invoice list + SQL was bad when several invoices had the same 
amount on the same thirdparty


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

  Changed paths:
    M htdocs/compta/stats/index.php

  Log Message:
  -----------
  Added w/o VAT on turnover report


  Commit: 029394aa3f6fb873014f6473357cd226aa292176
      
https://github.com/Dolibarr/dolibarr/commit/029394aa3f6fb873014f6473357cd226aa292176
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Fix : linked object not deleted when deleting a supplier invoice


  Commit: 8bae6a774d0612b5cba0933d38370ddf5818e187
      
https://github.com/Dolibarr/dolibarr/commit/8bae6a774d0612b5cba0933d38370ddf5818e187
  Author: Juanjo Menent <address@hidden>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

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

Fix on turnover reports


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f564d1912e1b...8bae6a774d06
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 0d1ab7: Merge branch 'develop' of https://github.com/Dolib..., Juanjo Menent <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] f564d1: New: Add graph for supplier invoices.
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] df88dc: Use a better variable name
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] f564d1: New: Add graph for supplier invoices.
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] df88dc: Use a better variable name
Index(es):
- Date
- Thread