[Dolibarr-git] [Dolibarr/dolibarr] 073810: Renamed llx_c_pays to llx_c

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 073810: Renamed llx_c_pays to llx_c_c

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 073810: Renamed llx_c_pays to llx_c_country & field "libel...
Date:	Wed, 13 Aug 2014 16:06:30 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0738103da8d94fd1a0e09bcc142ba7a3e9955e1b
      
https://github.com/Dolibarr/dolibarr/commit/0738103da8d94fd1a0e09bcc142ba7a3e9955e1b
  Author: aspangaro <address@hidden>
  Date:   2014-08-10 (Sun, 10 Aug 2014)

  Changed paths:
    M ChangeLog
    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/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/limits.php
    M htdocs/cashdesk/facturation.php
    M htdocs/compta/bank/class/account.class.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/core/ajax/ziptown.php
    A htdocs/core/class/ccountry.class.php
    R htdocs/core/class/cpays.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.formsocialcontrib.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.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/exports/export.php
    M htdocs/install/mysql/data/llx_00_c_pays.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    A htdocs/install/mysql/tables/llx_c_country.key.sql
    A htdocs/install/mysql/tables/llx_c_country.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_ziptown.key.sql
    M htdocs/install/mysql/tables/llx_c_ziptown.sql
    M htdocs/install/mysql/tables/llx_product.key.sql
    M htdocs/societe/ajaxcountries.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/localtaxes.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_thirdparty.php
    M htdocs/webservices/server_user.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_users_ldap2dolibarr.php

  Log Message:
  -----------
  Renamed llx_c_pays to llx_c_country & field "libelle" to "label"


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.form.class.php

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


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

  Changed paths:
    M htdocs/adherents/class/adherent.class.php

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


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

  Changed paths:
    M htdocs/core/modules/modSociete.class.php

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


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

  Changed paths:
    M htdocs/core/modules/modAdherent.class.php

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


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

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

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


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

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

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


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

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

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


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

  Changed paths:
    A htdocs/install/mysql/data/llx_00_c_country.sql
    R htdocs/install/mysql/data/llx_00_c_pays.sql

  Log Message:
  -----------
  Renamed data table


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

  Changed paths:
    M ChangeLog
    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/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/limits.php
    M htdocs/cashdesk/facturation.php
    M htdocs/compta/bank/class/account.class.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/core/ajax/ziptown.php
    A htdocs/core/class/ccountry.class.php
    R htdocs/core/class/cpays.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.formsocialcontrib.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.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/exports/export.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/migration/3.6.0-3.7.0.sql
    A htdocs/install/mysql/tables/llx_c_country.key.sql
    A htdocs/install/mysql/tables/llx_c_country.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_ziptown.key.sql
    M htdocs/install/mysql/tables/llx_c_ziptown.sql
    M htdocs/install/mysql/tables/llx_product.key.sql
    M htdocs/societe/ajaxcountries.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/localtaxes.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_thirdparty.php
    M htdocs/webservices/server_user.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_users_ldap2dolibarr.php

  Log Message:
  -----------
  Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
aspangaro-develop-favorite

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


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


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

  Changed paths:
    M ChangeLog
    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/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/limits.php
    M htdocs/cashdesk/facturation.php
    M htdocs/compta/bank/class/account.class.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/core/ajax/ziptown.php
    A htdocs/core/class/ccountry.class.php
    R htdocs/core/class/cpays.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.formsocialcontrib.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.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/exports/export.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/migration/3.6.0-3.7.0.sql
    A htdocs/install/mysql/tables/llx_c_country.key.sql
    A htdocs/install/mysql/tables/llx_c_country.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_ziptown.key.sql
    M htdocs/install/mysql/tables/llx_c_ziptown.sql
    M htdocs/install/mysql/tables/llx_product.key.sql
    M htdocs/societe/ajaxcountries.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/localtaxes.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_thirdparty.php
    M htdocs/webservices/server_user.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M scripts/user/sync_users_ldap2dolibarr.php

  Log Message:
  -----------
  Merge branch 'aspangaro-develop-favorite' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1fad543f6718...52630dca7dcc
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 073810: Renamed llx_c_pays to llx_c_country & field "libel..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 9af336: Add accountancy code for trips & fees and renamed ...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 3548f7: Start implement
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 9af336: Add accountancy code for trips & fees and renamed ...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 3548f7: Start implement
Index(es):
- Date
- Thread