[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 410efe: Merge branch 'develop' of add
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 410efe: Merge branch 'develop' of address@hidden:Dolibarr/... |
Date: |
Sun, 30 Oct 2011 15:54:26 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 410efe0427c0b96b4a7433fee13020b6dddcc767
https://github.com/Dolibarr/dolibarr/commit/410efe0427c0b96b4a7433fee13020b6dddcc767
Author: Laurent Destailleur <address@hidden>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
R .cvsignore
R build/.cvsignore
A build/doxygen/doxygen_warnings.log
R build/exe/doliwamp/.cvsignore
R dev/.cvsignore
R dev/phpunit/.cvsignore
R dev/skeletons/.cvsignore
R dev/test/.cvsignore
R dev/xdebug/.cvsignore
R doc/images/.cvsignore
R htdocs/.cvsignore
R htdocs/admin/.cvsignore
M htdocs/admin/dict.php
M htdocs/admin/tools/export.php
M htdocs/comm/propal.php
M htdocs/comm/propal/apercu.php
M htdocs/commande/apercu.php
M htdocs/commande/fiche.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
A htdocs/compta/localtax/class/localtax.class.php
A htdocs/compta/localtax/clients.php
A htdocs/compta/localtax/fiche.php
A htdocs/compta/localtax/index.php
A htdocs/compta/localtax/reglement.php
M htdocs/compta/prelevement/bon.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.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
R htdocs/conf/.cvsignore
M htdocs/contact/class/contact.class.php
M htdocs/core/ajax/loadinplace.php
M htdocs/core/ajax/saveinplace.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
A htdocs/core/js/datepicker.js.php
M htdocs/core/js/editinplace.js
A htdocs/core/js/jnotify.js
M htdocs/core/lib/accountancy.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/login/functions_dolibarr.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/init_menu_smartphone.sql
M htdocs/core/menus/standard/eldy.lib.php
R htdocs/core/modules/.cvsignore
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
R htdocs/core/modules/mailings/.cvsignore
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/core/tpl/login.tpl.php
A htdocs/custom
M htdocs/expedition/fiche.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/fiche.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
R htdocs/includes/.cvsignore
R htdocs/includes/jquery/plugins/flot/.cvsignore
R htdocs/includes/jquery/plugins/jcrop/.cvsignore
A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js
A htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js
R htdocs/includes/nusoap/.cvsignore
M htdocs/index.php
R htdocs/install/.cvsignore
M htdocs/install/mysql/migration/2.1.0-2.2.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
A htdocs/install/mysql/tables/llx_localtax.sql
M htdocs/langs/.htaccess
R htdocs/langs/ca_ES/.cvsignore
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/da_DK/errors.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/de_AT/errors.lang
M htdocs/langs/de_AT/other.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/errors.lang
M htdocs/langs/el_GR/other.lang
R htdocs/langs/en_AU/.cvsignore
R htdocs/langs/en_IN/.cvsignore
R htdocs/langs/en_NZ/.cvsignore
R htdocs/langs/en_US/.cvsignore
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/errors.lang
A htdocs/langs/en_US/js/jquery.ui.datepicker.js
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
R htdocs/langs/es_ES/.cvsignore
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/other.lang
R htdocs/langs/es_PR/.cvsignore
M htdocs/langs/fa_IR/errors.lang
M htdocs/langs/fa_IR/other.lang
M htdocs/langs/fi_FI/errors.lang
M htdocs/langs/fi_FI/other.lang
R htdocs/langs/fr_BE/.cvsignore
R htdocs/langs/fr_FR/.cvsignore
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/other.lang
A htdocs/langs/hu_HU/errors.lang
M htdocs/langs/hu_HU/other.lang
M htdocs/langs/is_IS/errors.lang
M htdocs/langs/is_IS/other.lang
R htdocs/langs/it_IT/.cvsignore
M htdocs/langs/it_IT/errors.lang
M htdocs/langs/it_IT/other.lang
A htdocs/langs/ja_JP/errors.lang
M htdocs/langs/ja_JP/other.lang
M htdocs/langs/nb_NO/errors.lang
M htdocs/langs/nb_NO/other.lang
R htdocs/langs/nl_BE/.cvsignore
M htdocs/langs/nl_BE/errors.lang
M htdocs/langs/nl_BE/other.lang
M htdocs/langs/nl_NL/errors.lang
M htdocs/langs/nl_NL/other.lang
R htdocs/langs/pl_PL/.cvsignore
M htdocs/langs/pl_PL/errors.lang
M htdocs/langs/pl_PL/other.lang
M htdocs/langs/pt_BR/errors.lang
M htdocs/langs/pt_BR/other.lang
R htdocs/langs/pt_PT/.cvsignore
M htdocs/langs/pt_PT/errors.lang
M htdocs/langs/pt_PT/other.lang
M htdocs/langs/ro_RO/errors.lang
M htdocs/langs/ro_RO/other.lang
M htdocs/langs/ru_RU/errors.lang
M htdocs/langs/ru_RU/other.lang
A htdocs/langs/ru_UA/errors.lang
M htdocs/langs/ru_UA/other.lang
M htdocs/langs/sl_SI/errors.lang
M htdocs/langs/sl_SI/other.lang
M htdocs/langs/sv_SE/errors.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/zh_CN/errors.lang
M htdocs/langs/zh_CN/other.lang
M htdocs/main.inc.php
M htdocs/master.inc.php
R htdocs/paypal/img/.cvsignore
R htdocs/public/donations/.cvsignore
M htdocs/societe/class/societe.class.php
R htdocs/support/.cvsignore
R htdocs/theme/.cvsignore
R htdocs/theme/auguria/.cvsignore
R htdocs/theme/auguria/fckeditor/.cvsignore
R htdocs/theme/auguria/fckeditor/images/.cvsignore
R htdocs/theme/auguria/img/.cvsignore
R htdocs/theme/auguria/img/menus/.cvsignore
M htdocs/theme/auguria/style.css.php
R htdocs/theme/bureau2crea/.cvsignore
R htdocs/theme/bureau2crea/fckeditor/.cvsignore
R htdocs/theme/bureau2crea/fckeditor/images/.cvsignore
R htdocs/theme/bureau2crea/img/.cvsignore
R htdocs/theme/bureau2crea/img/menus/.cvsignore
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
R htdocs/theme/common/.cvsignore
R htdocs/theme/common/flags/.cvsignore
R htdocs/theme/common/mime/.cvsignore
R htdocs/theme/common/treemenu/.cvsignore
R htdocs/theme/eldy/.cvsignore
R htdocs/theme/eldy/fckeditor/.cvsignore
R htdocs/theme/eldy/fckeditor/images/.cvsignore
R htdocs/theme/eldy/img/.cvsignore
R htdocs/theme/eldy/img/menus/.cvsignore
M htdocs/theme/eldy/style.css.php
M htdocs/theme/phones/smartphone/theme/default/default.css.php
M htdocs/user/group/fiche.php
M htdocs/user/passwordforgotten.php
R test/.cvsignore
R test/phpunit/.cvsignore
M test/phpunit/SocieteTest.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: d0711215abb97659664a9609bbcb77efd8401b1e
https://github.com/Dolibarr/dolibarr/commit/d0711215abb97659664a9609bbcb77efd8401b1e
Author: Laurent Destailleur <address@hidden>
Date: 2011-10-30 (Sun, 30 Oct 2011)
Changed paths:
M htdocs/core/js/datepicker.js.php
Log Message:
-----------
Complete locales
Compare: https://github.com/Dolibarr/dolibarr/compare/c3aafe0...d071121
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 410efe: Merge branch 'develop' of address@hidden:Dolibarr/...,
Laurent Destailleur <=