[Dolibarr-git] [Dolibarr/dolibarr] 8f72e1: Remove duplicate code

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 8f72e1: Remove duplicate code

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 8f72e1: Remove duplicate code
Date:	Sun, 14 Jul 2013 10:21:13 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8f72e1644459b582abebc44a03d6fdaae83e3864
      
https://github.com/Dolibarr/dolibarr/commit/8f72e1644459b582abebc44a03d6fdaae83e3864
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M htdocs/admin/commande.php

  Log Message:
  -----------
  Remove duplicate code


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

  Changed paths:
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/system/perf.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/includes/jquery/plugins/flot/Makefile

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


  Commit: 9d931b7b053223ed5e29835c904c6e6e7973d746
      
https://github.com/Dolibarr/dolibarr/commit/9d931b7b053223ed5e29835c904c6e6e7973d746
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M htdocs/admin/expedition.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/modExpedition.class.php
    A htdocs/install/doctemplates/shipment/template_shipment.odt

  Log Message:
  -----------
  Task # 862 : ODT templates on shipment


  Commit: 54961036be3b3c71b48abfe4ad1efa31bcc68bab
      
https://github.com/Dolibarr/dolibarr/commit/54961036be3b3c71b48abfe4ad1efa31bcc68bab
  Author: Geoffrey <address@hidden(none)>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M ChangeLog
    M dev/initdata/generate-commande.php
    M dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M htdocs/.gitignore
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cotisations.php
    M htdocs/admin/pdf.php
    M htdocs/admin/system/perf.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/fourn/commande/liste.php
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/fiche.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php

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

Conflicts:
        htdocs/admin/system/perf.php


  Commit: 3c7f4a3548bbd746e01f0f0b1ec9ea1cad591937
      
https://github.com/Dolibarr/dolibarr/commit/3c7f4a3548bbd746e01f0f0b1ec9ea1cad591937
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M ChangeLog
    M dev/initdata/generate-commande.php
    M dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M htdocs/.gitignore
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cotisations.php
    M htdocs/admin/pdf.php
    M htdocs/admin/system/perf.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/commande/liste.php
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/fiche.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/PropalTest.php

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

Conflicts:
        htdocs/admin/system/perf.php


  Commit: 0d40debeacfc5f8e1d4ad85400aed6b8d4446f1c
      
https://github.com/Dolibarr/dolibarr/commit/0d40debeacfc5f8e1d4ad85400aed6b8d4446f1c
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M htdocs/admin/system/perf.php

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

Conflicts:
        htdocs/admin/system/perf.php


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

  Changed paths:
    M ChangeLog
    M build/debian/control
    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
    R dev/initdata/generate-societe.php
    A dev/initdata/generate-societe.php
    M htdocs/admin/geoipmaxmind.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
    A htdocs/admin/translation.php
    R htdocs/admin/translation.php
    R htdocs/admin/workflow.php
    A htdocs/admin/workflow.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture/impayees.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
    R htdocs/core/class/extrafields.class.php
    A 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
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/html.formsms.class.php
    A htdocs/core/class/rssparser.class.php
    R htdocs/core/class/rssparser.class.php
    A htdocs/core/class/smtps.class.php
    R htdocs/core/class/smtps.class.php
    R htdocs/core/class/vcard.class.php
    A htdocs/core/class/vcard.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    R htdocs/core/triggers/interface_20_all_Logevents.class.php
    A 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
    R htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    A 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
    R htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    A 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
    M htdocs/ecm/index.php
    A htdocs/filefunc.inc.php
    R htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    R htdocs/fourn/commande/index.php
    A htdocs/fourn/commande/index.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 htdocs/master.inc.php
    M htdocs/paypal/admin/paypal.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 mko862

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


  Commit: 9c9b81c9815b0fe67ac8d365f20ca163560cca38
      
https://github.com/Dolibarr/dolibarr/commit/9c9b81c9815b0fe67ac8d365f20ca163560cca38
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/expedition.php
    M htdocs/core/class/html.formfile.class.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/expedition/fiche.php
    A htdocs/install/doctemplates/shipment/template_shipment.odt

  Log Message:
  -----------
  Merge pull request #1092 from atm-maxime/mko862

Task 862 : ODT on shipment


Compare: 
https://github.com/Dolibarr/dolibarr/compare/001072d34c23...9c9b81c9815b
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 8f72e1: Remove duplicate code, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr]
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] ece2e1: New: Prepare code to be able to choose bank accoun...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr]
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] ece2e1: New: Prepare code to be able to choose bank accoun...
Index(es):
- Date
- Thread