Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
Laurent Destailleur
c8d6a88f8a
Clean xdebug page.
2014-02-17 16:30:22 +01:00
Laurent Destailleur
908c39098d
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
fd22c9b69a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-15 15:23:47 +01:00
Laurent Destailleur
7e3c2d40ba
New: Make difference between virtual and physical stock easier to
...
understand.
2014-02-15 14:14:49 +01:00
Laurent Destailleur
7e2027ec39
Fix: Can not set delay to zero.
2014-02-14 13:05:49 +01:00
Laurent Destailleur
4b5748fd12
Fix: Can not set delay to zero.
2014-02-14 12:58:03 +01:00
Laurent Destailleur
b499efeccf
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/sociales/index.php
htdocs/compta/tva/index.php
2014-02-12 22:29:56 +01:00
Laurent Destailleur
7d74d0d3bd
CFix: The order field for prospect level was not visible making
...
dictionnary useless.
2014-02-12 22:28:16 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
abc8649e02
Fix: Bug of import of agenda when using https link
2014-02-08 01:16:20 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
Laurent Destailleur
77b3c9d2eb
Fix: Bad constant
2014-02-02 19:00:56 +01:00
Laurent Destailleur
ba931e18d4
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
7f15aa4582
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
47ff6a68bb
Fix: Test were inverted.
2014-01-30 18:11:40 +01:00
Laurent Destailleur
bb1575e0e6
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-24 10:20:03 +01:00
Laurent Destailleur
21b43d7604
Fix: if module invoice is disabled, option to automatically classify
...
order as billed does not exists, so "Classify billed" for order must be
done manually from order card.
2014-01-23 20:02:19 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Laurent Destailleur
5a7fe6b4a7
Fix: Change to make debian package ok despite removal of ckeditor
...
package.
2014-01-05 01:17:38 +01:00
Laurent Destailleur
29ae579298
Fix: Bad link
2013-12-27 20:29:30 +01:00
simnandez
3a496d1fa1
Fix: setup not saving changes
2013-12-26 11:33:47 +01:00
simnandez
91b104aeb8
Fix: setup not saving changes
2013-12-26 11:32:13 +01:00
simnandez
bf333d4f54
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:39:37 +01:00
simnandez
d6b2f96c19
Fix: Some config data are shared between suppliers orders and suppliers
...
invoices
2013-12-23 16:38:38 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
5a4b5dcc26
Fix: Missing condition
2013-12-14 14:21:27 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +01:00
Laurent Destailleur
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
a90f6ef368
Fix: Error management with corrupted module files
2013-12-08 02:32:04 +01:00
Laurent Destailleur
62e209520a
Fix: Update when submitting form
2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f
Fix: W3C form must be outside table tag
2013-12-07 00:26:30 +01:00
Laurent Destailleur
42a3cbd27c
Fix: Missing css class
2013-12-04 23:21:57 +01:00
Laurent Destailleur
6c26684284
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:16:18 +01:00
Laurent Destailleur
88ae0a7945
Fix: the rename function is bugged with some windows. I add a
...
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
2013-11-28 12:58:02 +01:00
Laurent Destailleur
6ffdc039a2
Fix: When option is not set, it must not appears as set.
2013-11-23 14:51:49 +01:00
Laurent Destailleur
3c0ee64648
New: Add links to social networks
2013-11-16 15:40:46 +01:00
Laurent Destailleur
b7190d2609
Fix: Several bugs.
2013-11-16 13:00:21 +01:00
Laurent Destailleur
628fbc7b7d
Fix: bad picto
2013-11-05 15:14:23 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Laurent Destailleur
ecb1f490ae
Fix: Option drop tables was broken
2013-11-01 17:20:36 +01:00
Laurent Destailleur
139ed68d6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-11-01 17:19:43 +01:00
Laurent Destailleur
60d4033e59
Fix: Option drop tables was broken
2013-11-01 17:19:25 +01:00
Florian Henry
f512ef344a
Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
...
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
93c5720579
New: Add path to installed dir of external modules + Name and web of
...
module provider.
2013-10-28 01:37:04 +01:00
Laurent Destailleur
bcd63d2466
Look: Remove useless array title bar
2013-10-25 18:01:45 +02:00
Laurent Destailleur
601de7a308
Fix: Test not working
2013-09-29 14:00:56 +02:00
Laurent Destailleur
072247f1c8
Fix: Use correct translation key
2013-09-25 19:07:25 +02:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
50ce834dd0
[ bug #1049 ] agenda isn't save preferences
2013-09-11 11:08:38 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Grand Philippe
da384dda18
uniformize
2013-09-02 11:53:07 +02:00
Grand Philippe
4c5d9e8441
fix : activate a model
2013-09-02 10:17:45 +02:00
Grand Philippe
7a64ad1a26
some fix for contract model and clean code
2013-08-26 14:29:46 +02:00
Grand Philippe
e9dc71a9af
first step to complete contract functionalities
2013-08-24 16:18:30 +02:00
Grand Philippe
a0c04a548b
first step to complete contract functionalities
2013-08-24 15:59:49 +02:00
Grand Philippe
e56e0ebfb5
add extrafields
2013-08-24 13:49:55 +02:00
simnandez
b5e10a061b
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 16:50:33 +02:00
simnandez
db46bc88ca
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 16:10:01 +02:00
simnandez
9741b49b75
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 09:28:23 +02:00
simnandez
fa5f09d6e0
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg: Works in admin
2013-08-14 12:48:00 +02:00
simnandez
88356acc3a
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg: Init works in admin
2013-08-14 11:11:49 +02:00
simnandez
b9e1a57f67
Fix: [ bug #1029 ] Tulip numbering mask
2013-08-08 10:00:06 +02:00
Laurent Destailleur
2a0597a6d4
Merge pull request #1161 from PaulPoulain/948-develop
...
T948-develop :Classify Billed when the price of bill is greater than command
2013-08-07 16:48:32 -07:00
lalaina rasamoelina
0fa4739d47
T948-develop :Classify Billed when the price of bill is greater than command
...
-In the workflow i've added on bouton which permitted
to classify billed when the price of bills is greater
than command,if her status is delivered
/htdocs/admin/workflow.php
2013-08-06 16:57:40 +02:00
Juanjo Menent
aab90bfe76
Merge pull request #1154 from atm-maxime/develop
...
Fix : supplier invoice mask + numbering
2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
08a3b0c905
Fix : supplier invoice mask + numbering
2013-08-06 15:27:51 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
aab1a6d958
New: Add hook addHomeSetup
2013-08-05 10:10:44 +02:00
simnandez
283d9eb064
Text for invoices numbering modules more clear. Update ChangeLog
2013-08-02 15:27:37 +02:00
Juanjo Menent
ba8d094ec5
Merge pull request #1152 from atm-maxime/develop
...
Better fix for email text / signature integration
2013-08-02 03:13:42 -07:00
simnandez
6d1a021382
New: [ task #1005 ] Update mercure module with replacement invoices.
2013-08-02 12:11:14 +02:00
Maxime Kohlhaas
229c2d890f
Add possibility to define default VAT accountancy code for purchase
2013-08-02 10:43:53 +02:00
Maxime Kohlhaas
a6ef341ae7
Task # 1016 : can define a specific numbering for deposits
2013-08-01 16:30:31 +02:00
Maxime Kohlhaas
eccbf89ecd
Bank account sharing for multi company
2013-08-01 16:15:53 +02:00
Laurent Destailleur
df0a8e0829
Fix: Bad link
2013-07-31 18:43:37 +02:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Laurent Destailleur
88d1e7258b
Merge pull request #1140 from atm-maxime/develop
...
Task # 853 : Can hide in conf the search by product supplier ref
2013-07-30 03:29:12 -07:00
Laurent Destailleur
1c24f9e35e
Merge pull request #1138 from atm-maxime/3.4
...
Fix : Numbering on supplier invoice was not saved and on shipment displa...
2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
1b54efcaaf
Task # 853 : Can hide in conf the search by product supplier ref, and displayed only if product and supplier module are enabled
2013-07-30 11:26:37 +02:00
Maxime Kohlhaas
f9c2910f84
Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok
2013-07-30 09:21:45 +02:00
Cédric Salvador
e3d5f086b6
background color
2013-07-29 12:31:15 +02:00
Cédric Salvador
53265591fc
separated replenishment configuration
2013-07-29 12:31:12 +02:00
Cédric Salvador
52cfecd0af
added an option to use virtual stock instead of physical stock
2013-07-29 12:31:12 +02:00
Cédric Salvador
5f526fd84a
separated replenishment configuration
2013-07-29 12:31:08 +02:00
Cédric Salvador
9b4601bcf2
added an option to use virtual stock instead of physical stock
2013-07-29 12:31:07 +02:00
Laurent Destailleur
36c73c4798
Look: Beautify backup page.
2013-07-28 17:25:58 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +02:00
Laurent Destailleur
a386179f47
New: Numbering models with a suffix for specific country is visible only
...
if company is from this country.
2013-07-26 15:17:36 +02:00
Laurent Destailleur
5608e320f7
New: Can add a suffix into filename of template after -. This may be
...
used in future as specific criteria to filter list of numbering models
to show.
2013-07-26 15:10:56 +02:00
Laurent Destailleur
68d83dd653
Some fix into perf.php page.
2013-07-24 00:34:08 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Maxime Kohlhaas
01e4d905fb
Start work on bank sharing for multi-company
2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
9e5286bce9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-14 13:27:41 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
0d40debeac
Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 17:17:43 +02:00
Maxime Kohlhaas
3c7f4a3548
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:55:33 +02:00
Geoffrey
54961036be
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:40:10 +02:00
Laurent Destailleur
158a2b8ca8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/.gitignore
2013-07-11 11:52:32 +02:00
Maxime Kohlhaas
9d931b7b05
Task # 862 : ODT templates on shipment
2013-07-10 15:54:28 +02:00
Maxime Kohlhaas
cfc999a06d
Merge
2013-07-10 15:44:53 +02:00
Maxime Kohlhaas
8f72e16444
Remove duplicate code
2013-07-10 15:34:36 +02:00
simnandez
ca406d0980
Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS
2013-07-10 15:34:16 +02:00
simnandez
50395fc8c4
Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS
2013-07-10 15:32:29 +02:00
Laurent Destailleur
a4abfe1abc
New: Can add an event automatically when a projet is create.
2013-07-10 14:46:16 +02:00
Laurent Destailleur
a60cc916f6
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-07-10 10:34:56 +02:00
Laurent Destailleur
752bc0ccff
Work on tool for performance advice.
2013-07-09 18:45:14 +02:00
Laurent Destailleur
f4428c8a8a
Fix: Bad link
2013-07-09 15:27:06 +02:00
Laurent Destailleur
0ca4e4ffe8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b
New: Add a page on performance advice
2013-07-09 13:50:20 +02:00
Laurent Destailleur
c1cb5e9bff
Fix geoipmaxmind module
2013-07-09 00:19:58 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
529a58cc9d
New: Add advice into info help
2013-07-05 12:04:55 +02:00
Laurent Destailleur
6f5a918373
New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
...
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
Laurent Destailleur
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1
Fix: warning not always visible. Depends if addon modules were
...
installed. Var should provide a quick fix.
2013-06-25 21:25:09 +02:00
Laurent Destailleur
a8547b5375
New: Add property hidden into module descriptor to allow to hide a
...
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Laurent Destailleur
c3f5e0c6ee
New: Show version of client lib used by mysql drivers
2013-06-07 19:19:11 +02:00
Cédric Salvador
b747b0349d
merge
2013-06-06 18:31:33 +02:00
Laurent Destailleur
e25651204c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/admin.lib.php
2013-06-05 18:56:41 +02:00