Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
aspangaro
81dc1415de
Untranslatable token in activity box
2014-12-09 05:04:39 +01:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Laurent Destailleur
c9d27383a4
Fix: When option to use optimize display for text borwser and blin
...
person is on, box addon was broken.
2014-07-29 00:50:57 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
51b6be4a64
Fix: If user has no perm to see other user, see himself.
2014-05-26 17:33:19 +02:00
Laurent Destailleur
1199d54fb2
Fix: When user has no permissions to see all other user, we must keep
...
only user.
2014-05-26 17:21:48 +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
Laurent Destailleur
2bac66fd52
Merge remote-tracking branch 'origin/3.5' into develop
2014-05-10 19:53:06 +02:00
Laurent Destailleur
a627dd9ae8
Fix: Duplicate line when project has no tasks.
2014-05-09 17:14:40 +02:00
Laurent Destailleur
b56f59b313
Perf: Avoid to isntantiate object 'form' into 'subform' classes when
...
already available.
Qual: Better information into xdebug page.
2014-05-01 16:26:57 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8
Fix: [ bug #1354 ] Tasks disapear in same sub-task
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/projet/class/project.class.php
2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f
Fix: [ bug #1354 ] Tasks disapear in same sub-task
2014-04-26 21:36:58 +02:00
Laurent Destailleur
889ed4a49c
Fix: div was opened and not close or the oposite.
2014-04-24 01:26:28 +02:00
Raphaël Doursenaud
32ad4461b8
Qual: Missing method argument
2014-04-23 18:23:57 +02:00
Raphaël Doursenaud
0ca5a46345
Qual: Bad copy/paste
2014-04-23 18:23:57 +02:00
Laurent Destailleur
241ae7a4d1
Fix: Miscellaneous bugs on tasks management
...
Conflicts:
htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
afca98323b
Fix: Miscellaneous bugs on tasks management
2014-03-11 20:38:29 +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
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
31d3e419b2
Fix: doxygen
2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2
New: Add method to use a dictionnary as a combo box.
2013-09-22 23:54:01 +02:00
Laurent Destailleur
57dee255a2
Normalize code
2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e
Merge remote-tracking branch 'origin/3.4' into develop
2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183
Fix: Bad sql request
2013-09-14 14:34:45 +02:00
BENKE Charles
085a8d68db
Update html.formother.class.php
...
bugfix
2013-09-14 10:41:36 +02:00
Laurent Destailleur
444a3328c6
New: More options to select status of users into select user list.
2013-07-27 14:45:55 +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
lalaina rasamoelina
4ecc9b30a9
Delete the name of user who are disable in the creation of events
2013-07-22 11:17:45 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
2005ce8d6e
Fix: Error with jmobile
2013-05-26 05:02:46 +02:00
Laurent Destailleur
f3f4dec96e
Fix: Error with jmobile
2013-05-26 05:01:28 +02:00
Laurent Destailleur
9b30f116f1
Fix: Some lib missing when jmobile enabled.
2013-05-10 12:48:11 +02:00
Laurent Destailleur
cce857d6ee
Fix: When box is removed, it is added into combo box of available boxes.
2013-04-25 01:35:33 +02:00
Laurent Destailleur
854b9df96d
Qual: Clean code of box management
2013-04-23 16:18:26 +02:00
Laurent Destailleur
bb3f40a1bf
Qual: Clean code to be able to update combo box when removing a box.
...
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
Laurent Destailleur
570e4391a5
Fix: Box with product out of stocks for pgsql
2013-04-19 14:51:39 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
24427d2c65
Use combo list for revenue stamp
2013-03-24 00:35:40 +01:00
Laurent Destailleur
9729e83e66
Fix: Do not use deprecated function
...
New: ajax constant on off can be reversed
2013-03-13 23:05:34 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
Laurent Destailleur
b89b74e933
Fix: load at wrong place
2013-01-17 17:40:27 +01:00
Laurent Destailleur
f1f7ff315f
Fix: CRLF
2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +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
Laurent Destailleur
1e9cb6b1d4
Qual: A translation file must not be loaded into class constructors, but
...
at output level.
2013-01-15 17:06:53 +01:00
