Laurent Destailleur
|
cb98d6cb93
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-07-19 15:32:20 +02:00 |
|
Laurent Destailleur
|
2f2b0df6f8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
|
2015-07-19 12:26:31 +02:00 |
|
aspangaro
|
4a899cd856
|
Typo
|
2015-07-15 19:13:23 +02:00 |
|
Regis Houssin
|
e82f4c474b
|
Fix: for avoid error with main context hooks, with $langs object for
example.
|
2015-07-03 22:14:34 +02:00 |
|
Laurent Destailleur
|
52222ecdfe
|
Avoid tooltip into tooltip
|
2015-02-01 01:28:15 +01:00 |
|
Frédéric FRANCE
|
5b9a134d69
|
Update objectonoff.php
|
2014-10-18 22:47:12 +02:00 |
|
Frédéric FRANCE
|
489045d715
|
Rename productonoff.php to objectonoff.php
|
2014-10-18 17:11:47 +02:00 |
|
Frédéric FRANCE
|
7f308bf9b5
|
Update productonoff.php
|
2014-10-12 17:00:42 +02:00 |
|
Frédéric FRANCE
|
33bb150b44
|
Update productonoff.php
|
2014-10-12 16:30:58 +02:00 |
|
Frédéric FRANCE
|
052e507271
|
Update productonoff.php
|
2014-10-12 15:56:04 +02:00 |
|
Frédéric FRANCE
|
77d7764215
|
Create productonoff.php
|
2014-10-12 14:22:32 +02:00 |
|
Regis Houssin
|
44cecb8e7d
|
Fix: add possibility to use element id
|
2014-09-26 09:20:02 +02:00 |
|
Laurent Destailleur
|
7021f4fb01
|
Fix: Message show when dir is out of sync with database cache was wrong.
|
2014-09-03 16:09:14 +02:00 |
|
Laurent Destailleur
|
5738d6de98
|
Fix: sql request not compatible with pgsql
|
2014-08-30 20:04:53 +02:00 |
|
aspangaro
|
0738103da8
|
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
|
2014-08-10 13:37:39 +02:00 |
|
Maxime Kohlhaas
|
1b3efbb9a3
|
New : add attachments on user cards
|
2014-08-05 16:01:40 +02:00 |
|
Maxime Kohlhaas
|
90c397d1a4
|
New: Intervention documents are now available in ECM module
|
2014-08-05 15:24:49 +02:00 |
|
Marcos García de La Fuente
|
ec661d0c6c
|
Removed index.php and replaced them with blank index.html as it is more appropriate
|
2014-07-12 23:18:57 +02:00 |
|
Raphaël Doursenaud
|
c48c3a9d91
|
Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
|
2014-05-26 13:51:25 +02:00 |
|
Florian HENRY
|
d2e2dabf26
|
Add showempty into combobox
|
2014-05-13 11:40:19 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|
Laurent Destailleur
|
19d71ffb38
|
Prepare fix to hide images generated by "preview" feature.
|
2014-04-29 21:14:55 +02:00 |
|
Raphaël Doursenaud
|
39c064cb74
|
Qual: Removed useless assignment from void method
|
2014-04-23 18:23:54 +02:00 |
|
Laurent Destailleur
|
255a1f6497
|
Fix: String translated twice
|
2014-02-05 20:57:43 +01:00 |
|
Laurent Destailleur
|
2d8214a940
|
Fix: The delete button into ecm module does not work when ajax disabled.
|
2014-01-05 18:37:26 +01:00 |
|
Laurent Destailleur
|
0f4ceca8ec
|
Fix: tons of bugs into ecm module
|
2013-11-17 02:59:01 +01:00 |
|
Laurent Destailleur
|
dd0612099c
|
Qual: Uniformize fields departement_id into state_id
|
2013-09-20 14:35:58 +02:00 |
|
Laurent Destailleur
|
854b9df96d
|
Qual: Clean code of box management
|
2013-04-23 16:18:26 +02:00 |
|
Laurent Destailleur
|
e19e0ff557
|
Fix: Error management
|
2013-04-22 00:57:56 +02:00 |
|
Marcos García
|
293fc89a9f
|
Missing copyright
|
2013-04-21 12:45:34 +02:00 |
|
Marcos García
|
17902a8455
|
Removed var_dump
|
2013-04-21 12:44:13 +02:00 |
|
Marcos García
|
7befeae371
|
ECM Refactor
|
2013-04-21 12:42:58 +02:00 |
|
fhenry
|
7881502b52
|
[ task #773 ] Add Project document in GED(ECM) modules
|
2013-03-25 09:56:07 +01:00 |
|
Grand Philippe
|
86de772b31
|
english language standardization
|
2013-02-24 17:08:52 +01:00 |
|
Grand Philippe
|
844433d0a2
|
english standardization
|
2013-02-22 17:11:53 +01:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Regis Houssin
|
a4f0b7f0df
|
Fix: avoid error with external modules
|
2012-12-05 11:36:10 +01:00 |
|
Laurent Destailleur
|
6c0fb9a1f1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2012-10-27 20:04:03 +02:00 |
|
Laurent Destailleur
|
a7e35a9308
|
Fix: If we exclude dirs, we must also clean array to avoid to count
them.
|
2012-10-27 20:02:09 +02:00 |
|
Regis Houssin
|
2bbfad2460
|
Fix: missing parameter
|
2012-10-27 11:30:08 +02:00 |
|
Regis Houssin
|
1cbd2a1b1c
|
Fix: broken feature
|
2012-10-25 08:45:35 +02:00 |
|
Laurent Destailleur
|
4b27a9215b
|
Fix: Show message only when needed
|
2012-10-03 23:15:57 +02:00 |
|
Laurent Destailleur
|
59a33db53d
|
Fix: Add warning to ask refresh.
|
2012-10-03 20:10:29 +02:00 |
|
Regis Houssin
|
d08e66b0b8
|
Fix: add member module compatibility
|
2012-09-26 10:43:15 +02:00 |
|
Laurent Destailleur
|
d48f294531
|
New: [ task #289 ] Reorder tasks
|
2012-09-15 15:33:00 +02:00 |
|
Regis Houssin
|
e19f8c54f1
|
Fix: strict mode hurricane
|
2012-09-15 10:01:35 +02:00 |
|
Regis Houssin
|
ee1cf819f7
|
Fix: mass convert line delimiters
|
2012-09-07 17:23:16 +02:00 |
|
Regis Houssin
|
5270ec06cb
|
Fix: compatibility with multicompany transverse mode
|
2012-09-07 17:20:12 +02:00 |
|
Regis Houssin
|
a00205a17d
|
New: add possibility to set and del anothers constants
|
2012-09-02 22:06:03 +02:00 |
|