dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] ab9226: Delete elements have a link w


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] ab9226: Delete elements have a link with old module ventil...
Date: Mon, 29 Sep 2014 07:32:05 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ab9226aab6bc4a53574e8dab2c81ed4c84214f53
      
https://github.com/Dolibarr/dolibarr/commit/ab9226aab6bc4a53574e8dab2c81ed4c84214f53
  Author: aspangaro <address@hidden>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    R htdocs/compta/ventilation/fiche.php
    R htdocs/compta/ventilation/fournisseur/fiche.php
    R htdocs/compta/ventilation/fournisseur/index.php
    R htdocs/compta/ventilation/fournisseur/lignes.php
    R htdocs/compta/ventilation/fournisseur/liste.php
    R htdocs/compta/ventilation/index.php
    R htdocs/compta/ventilation/lignes.php
    R htdocs/compta/ventilation/liste.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modComptabilite.class.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_TW/admin.lang

  Log Message:
  -----------
  Delete elements have a link with old module ventilation - Replace today by 
module Accounting Expert


  Commit: 6d26a7a46d5a7e8a30d81f862f01726c8e7f333d
      
https://github.com/Dolibarr/dolibarr/commit/6d26a7a46d5a7e8a30d81f862f01726c8e7f333d
  Author: aspangaro <address@hidden>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M .tx/config
    M ChangeLog
    M build/debian/control
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journaux.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/triggers.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/categorie.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/fiche.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/journal/purchasesjournal.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/paiement/info.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/fourn/facture/fiche.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_facture_fourn.sql
    M htdocs/install/mysql/tables/llx_fichinter.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/install/mysql/tables/llx_propal.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/es_ES/accountancy.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/dict.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/salaries.lang
    M htdocs/langs/es_ES/users.lang
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/webservices/server_invoice.php
    M test/phpunit/AllTests.php
    A test/phpunit/FichInterTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-accounting


  Commit: e35135d5b15ebe750f070f3da4c6580b338590b7
      
https://github.com/Dolibarr/dolibarr/commit/e35135d5b15ebe750f070f3da4c6580b338590b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    R htdocs/compta/ventilation/fournisseur/index.php
    R htdocs/compta/ventilation/fournisseur/lignes.php
    R htdocs/compta/ventilation/index.php
    R htdocs/compta/ventilation/lignes.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modComptabilite.class.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_TW/admin.lang

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

Conflicts:
        htdocs/compta/ventilation/card.php
        htdocs/compta/ventilation/fournisseur/card.php
        htdocs/compta/ventilation/fournisseur/list.php
        htdocs/compta/ventilation/list.php
        htdocs/core/menus/init_menu_auguria.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cb302c16e746...e35135d5b15e

reply via email to

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