[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7a9ce4: Uniformize code $_SERVER["PHP
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7a9ce4: Uniformize code $_SERVER["PHP_SELF"] |
|
Date: |
Mon, 22 Sep 2014 14:43:54 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7a9ce455d97359d293233590202df4d825e3c375
https://github.com/Dolibarr/dolibarr/commit/7a9ce455d97359d293233590202df4d825e3c375
Author: aspangaro <address@hidden>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/adherents/cotisations.php
M htdocs/boutique/client/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/produits/index.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/rejets.php
M htdocs/contrat/services.php
M htdocs/cron/list.php
M htdocs/expedition/liste.php
M htdocs/fourn/contact.php
M htdocs/fourn/facture/paiement.php
M htdocs/product/popuprop.php
M htdocs/product/reassort.php
M htdocs/public/members/public_list.php
M htdocs/societe/notify/fiche.php
M htdocs/societe/notify/index.php
Log Message:
-----------
Uniformize code $_SERVER["PHP_SELF"]
Commit: 9da597d56ebc31b970ae74de7ce9760572385f57
https://github.com/Dolibarr/dolibarr/commit/9da597d56ebc31b970ae74de7ce9760572385f57
Author: aspangaro <address@hidden>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/.gitignore
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/deplacement/class/deplacementstats.class.php
M htdocs/compta/dons/class/don.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/expedition/liste.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/fichinter/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_fichinter.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/donations.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/product/class/product.class.php
M htdocs/projet/contact.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/fiche.php
M htdocs/projet/ganttview.php
M htdocs/projet/index.php
M htdocs/projet/note.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/index.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop
Commit: b22aef3521a8e09c6f697234164075c6822785b2
https://github.com/Dolibarr/dolibarr/commit/b22aef3521a8e09c6f697234164075c6822785b2
Author: aspangaro <address@hidden>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/agenda.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/document.php
M htdocs/adherents/fiche.php
M htdocs/adherents/index.php
A htdocs/adherents/list.php
R htdocs/adherents/liste.php
M htdocs/adherents/note.php
M htdocs/adherents/type.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/bookmarks/fiche.php
A htdocs/bookmarks/list.php
R htdocs/bookmarks/liste.php
A htdocs/boutique/produits/osc-list.php
R htdocs/boutique/produits/osc-liste.php
M htdocs/categories/categorie.php
M htdocs/comm/fiche.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
A htdocs/comm/mailing/list.php
R htdocs/comm/mailing/liste.php
M htdocs/comm/propal/index.php
M htdocs/commande/contact.php
M htdocs/commande/document.php
M htdocs/commande/fiche.php
M htdocs/commande/index.php
A htdocs/commande/list.php
R htdocs/commande/liste.php
M htdocs/commande/note.php
M htdocs/compta/dons/fiche.php
M htdocs/compta/dons/index.php
A htdocs/compta/dons/list.php
R htdocs/compta/dons/liste.php
M htdocs/compta/index.php
A htdocs/compta/paiement/cheque/list.php
R htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/paiement/fiche.php
A htdocs/compta/paiement/list.php
R htdocs/compta/paiement/liste.php
A htdocs/compta/prelevement/list.php
R htdocs/compta/prelevement/liste.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
A htdocs/compta/ventilation/fournisseur/list.php
R htdocs/compta/ventilation/fournisseur/liste.php
A htdocs/compta/ventilation/list.php
R htdocs/compta/ventilation/liste.php
M htdocs/contact/fiche.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/fiche.php
M htdocs/contrat/index.php
A htdocs/contrat/list.php
R htdocs/contrat/liste.php
M htdocs/contrat/note.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/search_page.php
M htdocs/expedition/contact.php
M htdocs/expedition/fiche.php
M htdocs/expedition/index.php
A htdocs/expedition/list.php
R htdocs/expedition/liste.php
M htdocs/expedition/note.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
A htdocs/fourn/commande/list.php
R htdocs/fourn/commande/liste.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/fiche.php
M htdocs/fourn/index.php
A htdocs/fourn/list.php
R htdocs/fourn/liste.php
M htdocs/fourn/product/index.php
A htdocs/fourn/product/list.php
R htdocs/fourn/product/liste.php
M htdocs/index.php
M htdocs/livraison/fiche.php
M htdocs/main.inc.php
M htdocs/product/fiche.php
M htdocs/product/index.php
A htdocs/product/list.php
R htdocs/product/liste.php
M htdocs/product/stock/fiche.php
M htdocs/product/stock/index.php
A htdocs/product/stock/list.php
R htdocs/product/stock/liste.php
M htdocs/product/stock/mouvement.php
M htdocs/projet/contact.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/fiche.php
M htdocs/projet/ganttview.php
M htdocs/projet/index.php
A htdocs/projet/list.php
R htdocs/projet/liste.php
M htdocs/projet/note.php
M htdocs/projet/tasks.php
M htdocs/societe/index.php
Log Message:
-----------
Qual: Renamed all files & links "liste.php" into "list.php"
Commit: 0b20369dd7ebe2efae0f80360f980ebe5208f75d
https://github.com/Dolibarr/dolibarr/commit/0b20369dd7ebe2efae0f80360f980ebe5208f75d
Author: aspangaro <address@hidden>
Date: 2014-09-18 (Thu, 18 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/agenda.php
A htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
R htdocs/adherents/fiche.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/bookmarks/bookmarks.lib.php
A htdocs/bookmarks/card.php
R htdocs/bookmarks/fiche.php
M htdocs/bookmarks/list.php
A htdocs/boutique/client/card.php
R htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
A htdocs/boutique/commande/card.php
R htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
A htdocs/boutique/critiques/card.php
R htdocs/boutique/critiques/fiche.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
A htdocs/categories/card.php
M htdocs/categories/categorie.php
R htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
A htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
R htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/action/peruser.php
M htdocs/comm/address.php
A htdocs/comm/card.php
M htdocs/comm/contact.php
R htdocs/comm/fiche.php
M htdocs/comm/index.php
A htdocs/comm/mailing/card.php
R htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/mailing/list.php
M htdocs/comm/propal.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/prospect/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
A htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
R htdocs/commande/fiche.php
M htdocs/commande/index.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
A htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
R htdocs/compta/bank/fiche.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/bank/releve.php
A htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
R htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/list.php
A htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
R htdocs/compta/dons/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/index.php
A htdocs/compta/localtax/card.php
M htdocs/compta/localtax/class/localtax.class.php
R htdocs/compta/localtax/fiche.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
A htdocs/compta/paiement/card.php
A htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
R htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/class/paiement.class.php
R htdocs/compta/paiement/fiche.php
M htdocs/compta/paiement/list.php
A htdocs/compta/payment_sc/card.php
R htdocs/compta/payment_sc/fiche.php
M htdocs/compta/prelevement/bons.php
A htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
R htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/recap-compta.php
A htdocs/compta/salaries/card.php
M htdocs/compta/salaries/class/paymentsalary.class.php
R htdocs/compta/salaries/fiche.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
A htdocs/compta/tva/card.php
M htdocs/compta/tva/class/tva.class.php
R htdocs/compta/tva/fiche.php
M htdocs/compta/tva/quadri.php
A htdocs/compta/ventilation/card.php
R htdocs/compta/ventilation/fiche.php
A htdocs/compta/ventilation/fournisseur/card.php
R htdocs/compta/ventilation/fournisseur/fiche.php
M htdocs/compta/ventilation/fournisseur/list.php
M htdocs/compta/ventilation/list.php
A htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
R htdocs/contact/fiche.php
M htdocs/contact/list.php
A htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
R htdocs/contrat/fiche.php
M htdocs/contrat/index.php
M htdocs/contrat/list.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/lib/stock.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.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/modAgenda.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/tpl/objectline_edit.tpl.php
A htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
R htdocs/expedition/fiche.php
M htdocs/expedition/index.php
M htdocs/expedition/shipment.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/apercu.php
A htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
R htdocs/fichinter/fiche.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
A htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
A htdocs/fourn/commande/card.php
R htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/contact.php
A htdocs/fourn/facture/card.php
R htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
R htdocs/fourn/fiche.php
M htdocs/fourn/index.php
A htdocs/fourn/paiement/card.php
R htdocs/fourn/paiement/fiche.php
M htdocs/fourn/product/categorie.php
M htdocs/fourn/product/index.php
M htdocs/fourn/product/list.php
M htdocs/fourn/product/photos.php
M htdocs/fourn/recap-fourn.php
A htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
R htdocs/holiday/fiche.php
M htdocs/holiday/index.php
A htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
R htdocs/livraison/fiche.php
M htdocs/main.inc.php
M htdocs/margin/tabs/productMargins.php
A htdocs/product/card.php
M htdocs/product/class/product.class.php
A htdocs/product/composition/card.php
R htdocs/product/composition/fiche.php
R htdocs/product/fiche.php
M htdocs/product/list.php
M htdocs/product/popuprop.php
M htdocs/product/price.php
M htdocs/product/reassort.php
A htdocs/product/stats/card.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
R htdocs/product/stats/fiche.php
M htdocs/product/stats/propal.php
A htdocs/product/stock/card.php
M htdocs/product/stock/class/entrepot.class.php
R htdocs/product/stock/fiche.php
M htdocs/product/stock/index.php
M htdocs/product/stock/list.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/valo.php
A htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
R htdocs/projet/fiche.php
M htdocs/projet/index.php
M htdocs/societe/agenda.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/commerciaux.php
A htdocs/societe/notify/card.php
R htdocs/societe/notify/fiche.php
M htdocs/societe/notify/index.php
M htdocs/societe/soc.php
M htdocs/societe/societecontact.php
A htdocs/user/card.php
M htdocs/user/class/user.class.php
R htdocs/user/fiche.php
A htdocs/user/group/card.php
R htdocs/user/group/fiche.php
M htdocs/user/group/index.php
M htdocs/user/home.php
M htdocs/user/index.php
M scripts/emailings/mailing-send.php
M test/selenium/test_thirdparty.xml
Log Message:
-----------
Qual: Renamed all files & links "fiche.php" into "card.php"
Commit: 1592968709d1baf2ea46b864c415e73cc5b41705
https://github.com/Dolibarr/dolibarr/commit/1592968709d1baf2ea46b864c415e73cc5b41705
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/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.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/card.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/card.php
M htdocs/product/stock/class/entrepot.class.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
Commit: e147259e955edd3d7c1ae29d118b086a7c928b30
https://github.com/Dolibarr/dolibarr/commit/e147259e955edd3d7c1ae29d118b086a7c928b30
Author: aspangaro <address@hidden>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/cashjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/admin/compta.php
M htdocs/admin/salaries.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/quadri.php
M htdocs/core/class/conf.class.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/es_DO/compta.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_HN/compta.lang
M htdocs/langs/es_PE/compta.lang
M htdocs/langs/es_PR/compta.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_TW/compta.lang
Log Message:
-----------
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module
ACCOUNTINGEX 3.6
Commit: 1bcc2c92a3c4acedaf2200439d62ac66ab7a03df
https://github.com/Dolibarr/dolibarr/commit/1bcc2c92a3c4acedaf2200439d62ac66ab7a03df
Author: aspangaro <address@hidden>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M htdocs/accountancy/admin/index.php
M htdocs/admin/compta.php
Log Message:
-----------
compta_mode -> accounting_mode
Commit: 4b4fe9811f9a4b85d3ad7847d42934f59f02bf8e
https://github.com/Dolibarr/dolibarr/commit/4b4fe9811f9a4b85d3ad7847d42934f59f02bf8e
Author: aspangaro <address@hidden>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog
Commit: 9220419409ce332d69544e634883cfa062190945
https://github.com/Dolibarr/dolibarr/commit/9220419409ce332d69544e634883cfa062190945
Author: aspangaro <address@hidden>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
R test/phpunit/FichInterTest.php
A test/phpunit/FichinterTest.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/develop' into develop
Commit: 08d4195504f199f116adb924ca09280320942003
https://github.com/Dolibarr/dolibarr/commit/08d4195504f199f116adb924ca09280320942003
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/cashjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/agenda.php
A htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/document.php
R htdocs/adherents/fiche.php
M htdocs/adherents/index.php
A htdocs/adherents/list.php
R htdocs/adherents/liste.php
M htdocs/adherents/note.php
M htdocs/adherents/type.php
M htdocs/admin/compta.php
M htdocs/admin/salaries.php
M htdocs/bookmarks/bookmarks.lib.php
A htdocs/bookmarks/card.php
R htdocs/bookmarks/fiche.php
A htdocs/bookmarks/list.php
R htdocs/bookmarks/liste.php
A htdocs/boutique/client/card.php
R htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
A htdocs/boutique/commande/card.php
R htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
A htdocs/boutique/critiques/card.php
R htdocs/boutique/critiques/fiche.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
A htdocs/boutique/produits/osc-list.php
R htdocs/boutique/produits/osc-liste.php
A htdocs/categories/card.php
M htdocs/categories/categorie.php
R htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
A htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
R htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/action/peruser.php
M htdocs/comm/address.php
A htdocs/comm/card.php
M htdocs/comm/contact.php
R htdocs/comm/fiche.php
M htdocs/comm/index.php
A htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
R htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
A htdocs/comm/mailing/list.php
R htdocs/comm/mailing/liste.php
M htdocs/comm/propal.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/prospect/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
A htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/contact.php
M htdocs/commande/document.php
R htdocs/commande/fiche.php
M htdocs/commande/index.php
A htdocs/commande/list.php
R htdocs/commande/liste.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
A htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
R htdocs/compta/bank/fiche.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/bank/releve.php
A htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
R htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/list.php
A htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
R htdocs/compta/dons/fiche.php
M htdocs/compta/dons/index.php
A htdocs/compta/dons/list.php
R htdocs/compta/dons/liste.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/index.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
A htdocs/compta/localtax/card.php
M htdocs/compta/localtax/class/localtax.class.php
R htdocs/compta/localtax/fiche.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
A htdocs/compta/paiement/card.php
A htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
R htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/paiement/cheque/index.php
A htdocs/compta/paiement/cheque/list.php
R htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/paiement/class/paiement.class.php
R htdocs/compta/paiement/fiche.php
A htdocs/compta/paiement/list.php
R htdocs/compta/paiement/liste.php
A htdocs/compta/payment_sc/card.php
R htdocs/compta/payment_sc/fiche.php
M htdocs/compta/prelevement/bons.php
A htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
R htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
A htdocs/compta/prelevement/list.php
R htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/recap-compta.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
A htdocs/compta/salaries/card.php
M htdocs/compta/salaries/class/paymentsalary.class.php
R htdocs/compta/salaries/fiche.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
A htdocs/compta/tva/card.php
M htdocs/compta/tva/class/tva.class.php
R htdocs/compta/tva/fiche.php
M htdocs/compta/tva/quadri.php
A htdocs/compta/ventilation/card.php
R htdocs/compta/ventilation/fiche.php
A htdocs/compta/ventilation/fournisseur/card.php
R htdocs/compta/ventilation/fournisseur/fiche.php
A htdocs/compta/ventilation/fournisseur/list.php
R htdocs/compta/ventilation/fournisseur/liste.php
A htdocs/compta/ventilation/list.php
R htdocs/compta/ventilation/liste.php
A htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
R htdocs/contact/fiche.php
M htdocs/contact/list.php
A htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
R htdocs/contrat/fiche.php
M htdocs/contrat/index.php
A htdocs/contrat/list.php
R htdocs/contrat/liste.php
M htdocs/contrat/note.php
M htdocs/contrat/services.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/lib/stock.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.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/modAgenda.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/cron/list.php
A htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/contact.php
R htdocs/expedition/fiche.php
M htdocs/expedition/index.php
A htdocs/expedition/list.php
R htdocs/expedition/liste.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/apercu.php
A htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
R htdocs/fichinter/fiche.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
A htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
A htdocs/fourn/commande/card.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
R htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
A htdocs/fourn/commande/list.php
R htdocs/fourn/commande/liste.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/contact.php
A htdocs/fourn/facture/card.php
R htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
R htdocs/fourn/fiche.php
M htdocs/fourn/index.php
A htdocs/fourn/list.php
R htdocs/fourn/liste.php
A htdocs/fourn/paiement/card.php
R htdocs/fourn/paiement/fiche.php
M htdocs/fourn/product/categorie.php
M htdocs/fourn/product/index.php
A htdocs/fourn/product/list.php
R htdocs/fourn/product/liste.php
M htdocs/fourn/product/photos.php
M htdocs/fourn/recap-fourn.php
A htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
R htdocs/holiday/fiche.php
M htdocs/holiday/index.php
M htdocs/index.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/es_DO/compta.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_HN/compta.lang
M htdocs/langs/es_PE/compta.lang
M htdocs/langs/es_PR/compta.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_TW/compta.lang
A htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
R htdocs/livraison/fiche.php
M htdocs/main.inc.php
M htdocs/margin/tabs/productMargins.php
A htdocs/product/card.php
M htdocs/product/class/product.class.php
A htdocs/product/composition/card.php
R htdocs/product/composition/fiche.php
R htdocs/product/fiche.php
M htdocs/product/index.php
A htdocs/product/list.php
R htdocs/product/liste.php
M htdocs/product/popuprop.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
Commit: e163b0237fccdbc99a981f2da1dfd27159d17df1
https://github.com/Dolibarr/dolibarr/commit/e163b0237fccdbc99a981f2da1dfd27159d17df1
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
Commit: d1136beef1fe91b6968b60b423f49e46a783b442
https://github.com/Dolibarr/dolibarr/commit/d1136beef1fe91b6968b60b423f49e46a783b442
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/cashjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/agenda.php
A htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/document.php
R htdocs/adherents/fiche.php
M htdocs/adherents/index.php
A htdocs/adherents/list.php
R htdocs/adherents/liste.php
M htdocs/adherents/note.php
M htdocs/adherents/type.php
M htdocs/admin/compta.php
M htdocs/admin/salaries.php
M htdocs/bookmarks/bookmarks.lib.php
A htdocs/bookmarks/card.php
R htdocs/bookmarks/fiche.php
A htdocs/bookmarks/list.php
R htdocs/bookmarks/liste.php
A htdocs/boutique/client/card.php
R htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
A htdocs/boutique/commande/card.php
R htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
A htdocs/boutique/critiques/card.php
R htdocs/boutique/critiques/fiche.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
A htdocs/boutique/produits/osc-list.php
R htdocs/boutique/produits/osc-liste.php
A htdocs/categories/card.php
M htdocs/categories/categorie.php
R htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
A htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
R htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/action/peruser.php
M htdocs/comm/address.php
A htdocs/comm/card.php
M htdocs/comm/contact.php
R htdocs/comm/fiche.php
M htdocs/comm/index.php
A htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
R htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
A htdocs/comm/mailing/list.php
R htdocs/comm/mailing/liste.php
M htdocs/comm/propal.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/prospect/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
A htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/contact.php
M htdocs/commande/document.php
R htdocs/commande/fiche.php
M htdocs/commande/index.php
A htdocs/commande/list.php
R htdocs/commande/liste.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
A htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
R htdocs/compta/bank/fiche.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/bank/releve.php
A htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
R htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/list.php
A htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.php
R htdocs/compta/dons/fiche.php
M htdocs/compta/dons/index.php
A htdocs/compta/dons/list.php
R htdocs/compta/dons/liste.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/index.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
A htdocs/compta/localtax/card.php
M htdocs/compta/localtax/class/localtax.class.php
R htdocs/compta/localtax/fiche.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
A htdocs/compta/paiement/card.php
A htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
R htdocs/compta/paiement/cheque/fiche.php
M htdocs/compta/paiement/cheque/index.php
A htdocs/compta/paiement/cheque/list.php
R htdocs/compta/paiement/cheque/liste.php
M htdocs/compta/paiement/class/paiement.class.php
R htdocs/compta/paiement/fiche.php
A htdocs/compta/paiement/list.php
R htdocs/compta/paiement/liste.php
A htdocs/compta/payment_sc/card.php
R htdocs/compta/payment_sc/fiche.php
M htdocs/compta/prelevement/bons.php
A htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
R htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
A htdocs/compta/prelevement/list.php
R htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/recap-compta.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
A htdocs/compta/salaries/card.php
M htdocs/compta/salaries/class/paymentsalary.class.php
R htdocs/compta/salaries/fiche.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
A htdocs/compta/tva/card.php
M htdocs/compta/tva/class/tva.class.php
R htdocs/compta/tva/fiche.php
M htdocs/compta/tva/quadri.php
A htdocs/compta/ventilation/card.php
R htdocs/compta/ventilation/fiche.php
A htdocs/compta/ventilation/fournisseur/card.php
R htdocs/compta/ventilation/fournisseur/fiche.php
A htdocs/compta/ventilation/fournisseur/list.php
R htdocs/compta/ventilation/fournisseur/liste.php
A htdocs/compta/ventilation/list.php
R htdocs/compta/ventilation/liste.php
A htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
R htdocs/contact/fiche.php
M htdocs/contact/list.php
A htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
R htdocs/contrat/fiche.php
M htdocs/contrat/index.php
A htdocs/contrat/list.php
R htdocs/contrat/liste.php
M htdocs/contrat/note.php
M htdocs/contrat/services.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_members.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/boxes/box_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/fourn.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/sendings.lib.php
M htdocs/core/lib/stock.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.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/modAgenda.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/search_page.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/cron/list.php
A htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/contact.php
R htdocs/expedition/fiche.php
M htdocs/expedition/index.php
A htdocs/expedition/list.php
R htdocs/expedition/liste.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/apercu.php
A htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
R htdocs/fichinter/fiche.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
A htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
A htdocs/fourn/commande/card.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
R htdocs/fourn/commande/fiche.php
M htdocs/fourn/commande/history.php
M htdocs/fourn/commande/index.php
A htdocs/fourn/commande/list.php
R htdocs/fourn/commande/liste.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/contact.php
A htdocs/fourn/facture/card.php
R htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
R htdocs/fourn/fiche.php
M htdocs/fourn/index.php
A htdocs/fourn/list.php
R htdocs/fourn/liste.php
A htdocs/fourn/paiement/card.php
R htdocs/fourn/paiement/fiche.php
M htdocs/fourn/product/categorie.php
M htdocs/fourn/product/index.php
A htdocs/fourn/product/list.php
R htdocs/fourn/product/liste.php
M htdocs/fourn/product/photos.php
M htdocs/fourn/recap-fourn.php
A htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
R htdocs/holiday/fiche.php
M htdocs/holiday/index.php
M htdocs/index.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/es_DO/compta.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_HN/compta.lang
M htdocs/langs/es_PE/compta.lang
M htdocs/langs/es_PR/compta.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_TW/compta.lang
A htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
R htdocs/livraison/fiche.php
M htdocs/main.inc.php
M htdocs/margin/tabs/productMargins.php
A htdocs/product/card.php
M htdocs/product/class/product.class.php
A htdocs/product/composition/card.php
R htdocs/product/composition/fiche.php
R htdocs/product/fiche.php
M htdocs/product/index.php
A htdocs/product/list.php
R htdocs/product/liste.php
M htdocs/product/popuprop.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch 'aspangaro-develop' into develop
Commit: e1fec958ef202e3883ca3768eb389052c7cebe4f
https://github.com/Dolibarr/dolibarr/commit/e1fec958ef202e3883ca3768eb389052c7cebe4f
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M htdocs/core/lib/usergroups.lib.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
A htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
A htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
A htdocs/user/admin/group_extrafields.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/user/group/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b73fe26d6e36...e1fec958ef20
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 7a9ce4: Uniformize code $_SERVER["PHP_SELF"],
Laurent Destailleur <=