[Dolibarr-git] [Dolibarr/dolibarr] 1a87d9: Qual: Renamed table llx_c

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1a87d9: Qual: Renamed table llx_c_civ

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 1a87d9: Qual: Renamed table llx_c_civilite into llx_c_civi...
Date:	Thu, 21 Aug 2014 14:25:50 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1a87d98357b400146df07c9f57e409a64a891dc7
      
https://github.com/Dolibarr/dolibarr/commit/1a87d98357b400146df07c9f57e409a64a891dc7
  Author: aspangaro <address@hidden>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dict.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/install/mysql/data/llx_c_civilite.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    R htdocs/install/mysql/tables/llx_c_civilite.key.sql
    R htdocs/install/mysql/tables/llx_c_civilite.sql
    A htdocs/install/mysql/tables/llx_c_civility.key.sql
    A htdocs/install/mysql/tables/llx_c_civility.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Qual: Renamed table llx_c_civilite into llx_c_civility
field civilite into label in the same table and field civilite into civility in 
other table


  Commit: fe3939debee233a079629b59b18bfbb3432da701
      
https://github.com/Dolibarr/dolibarr/commit/fe3939debee233a079629b59b18bfbb3432da701
  Author: aspangaro <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Drop old index


  Commit: f774ff487b5e0292dfb5f7e1d8bf006442ed3ad4
      
https://github.com/Dolibarr/dolibarr/commit/f774ff487b5e0292dfb5f7e1d8bf006442ed3ad4
  Author: aspangaro <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M ChangeLog
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_page.php
    M htdocs/.gitignore
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/stats/geo.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/facture.php
    M htdocs/admin/limits.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/tools/update.php
    M htdocs/cashdesk/facturation.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php
    M htdocs/commande/liste.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/paiement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php
    M htdocs/core/ajax/ziptown.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_task.php
    A htdocs/core/class/ccountry.class.php
    M htdocs/core/class/commonobject.class.php
    R htdocs/core/class/cpays.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/html.formsocialcontrib.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/js/lib_head.js
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/contract/mod_contract_magre.php
    A htdocs/core/modules/contract/mod_contract_olive.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/exports/export.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/facture/paiement.php
    A htdocs/install/mysql/data/llx_00_c_country.sql
    R htdocs/install/mysql/data/llx_00_c_pays.sql
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/data/llx_c_type_fees.sql
    R htdocs/install/mysql/migration/2.0.0-2.1.0.sql
    R htdocs/install/mysql/migration/2.1.0-2.2.0.sql
    R htdocs/install/mysql/migration/2.2.0-2.4.0.sql
    R htdocs/install/mysql/migration/2.4.0-2.5.0.sql
    R htdocs/install/mysql/migration/2.5.0-2.6.0.sql
    R htdocs/install/mysql/migration/2.6.0-2.7.0.sql
    R htdocs/install/mysql/migration/2.7.0-2.8.0.sql
    R htdocs/install/mysql/migration/2.8.0-2.9.0.sql
    R htdocs/install/mysql/migration/2.9.0-3.0.0.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.key.sql
    A htdocs/install/mysql/tables/llx_c_country.key.sql
    A htdocs/install/mysql/tables/llx_c_country.sql
    M htdocs/install/mysql/tables/llx_c_departements.key.sql
    M htdocs/install/mysql/tables/llx_c_email_template.sql
    R htdocs/install/mysql/tables/llx_c_pays.key.sql
    R htdocs/install/mysql/tables/llx_c_pays.sql
    M htdocs/install/mysql/tables/llx_c_regions.key.sql
    M htdocs/install/mysql/tables/llx_c_regions.sql
    M htdocs/install/mysql/tables/llx_c_type_fees.sql
    M htdocs/install/mysql/tables/llx_c_ziptown.key.sql
    M htdocs/install/mysql/tables/llx_c_ziptown.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_holiday_types.sql
    M htdocs/install/mysql/tables/llx_product.key.sql
    A htdocs/install/mysql/tables/llx_projet_task_time.key.sql
    M htdocs/install/pgsql/functions/functions.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/bills.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/sendings.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/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/link.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
    A htdocs/langs/pt_PT/link.lang
    A htdocs/langs/ro_RO/link.lang
    A htdocs/langs/ru_RU/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
    A htdocs/langs/tr_TR/link.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
    A htdocs/societe/societecontact.php
    A htdocs/user/agenda_extsites.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: af92eb372589f56e8e212538e5c6b465d74acdc9
      
https://github.com/Dolibarr/dolibarr/commit/af92eb372589f56e8e212538e5c6b465d74acdc9
  Author: aspangaro <address@hidden>
  Date:   2014-08-20 (Wed, 20 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Problem of merging


  Commit: 0f7e09d01f50706db9c3d17c9fd03966bb6cdc0d
      
https://github.com/Dolibarr/dolibarr/commit/0f7e09d01f50706db9c3d17c9fd03966bb6cdc0d
  Author: aspangaro <address@hidden>
  Date:   2014-08-20 (Wed, 20 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 04b611f7585bf453665777ca909a9f06da616777
      
https://github.com/Dolibarr/dolibarr/commit/04b611f7585bf453665777ca909a9f06da616777
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dict.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/install/mysql/data/llx_c_civilite.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    R htdocs/install/mysql/tables/llx_c_civilite.key.sql
    R htdocs/install/mysql/tables/llx_c_civilite.sql
    A htdocs/install/mysql/tables/llx_c_civility.key.sql
    A htdocs/install/mysql/tables/llx_c_civility.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge pull request #1820 from aspangaro/develop-trad1

Qual: Renamed table llx_c_civilite into llx_c_civility


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eb3c53d89704...04b611f7585b
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 1a87d9: Qual: Renamed table llx_c_civilite into llx_c_civi..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 8b6d61: Hidde version on login page
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 1d5fb1: Fix: missing global declarations
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 8b6d61: Hidde version on login page
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 1d5fb1: Fix: missing global declarations
Index(es):
- Date
- Thread