Laurent Destailleur
06d19a5a40
Work on a new widget
2015-09-12 11:33:22 +02:00
Laurent Destailleur
5e81eb7586
Merge pull request #3505 from GPCsolutions/firephp
...
Setup FirePHP like ChromePHP
2015-09-12 11:02:31 +02:00
Laurent Destailleur
ff1b18ff46
Merge pull request #3501 from FHenry/develop
...
NEW : Import link between thirdparties and sales representatives
2015-09-12 11:01:04 +02:00
Raphaël Doursenaud
fc91e553ad
Setup FirePHP like ChromePHP
2015-09-11 17:45:30 +02:00
Laurent Destailleur
1401debace
Fix print into form to attach file must be into return.
2015-09-11 08:32:40 +02:00
Laurent Destailleur
4b97fae28f
Fix migration missing for leave request module
...
Fix permission label for expense report and leave request
2015-09-11 07:52:06 +02:00
Laurent Destailleur
7951483c5f
Fix: examples ko for import
...
Fix bad picto for export
2015-09-10 12:47:25 +02:00
Laurent Destailleur
1396ed8f03
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-09-10 12:12:55 +02:00
Florian HENRY
6cb993c0b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-10 11:20:03 +02:00
aspangaro
0055606256
Invert
2015-09-10 07:36:17 +02:00
aspangaro
3a90bfa6d3
Merge remote-tracking branch 'Upstream/develop' into develop-60
2015-09-10 06:59:23 +02:00
aspangaro
b1b7966c88
ckeditor: define the default skin when constant don't exist.
2015-09-10 06:58:20 +02:00
aspangaro
ae6f547ba5
Merge remote-tracking branch 'Upstream/develop' into develop-62
2015-09-09 20:57:28 +02:00
Laurent Destailleur
41803cd868
Merge pull request #3470 from GPCsolutions/develop-3440
...
Fix #3440 Only search for core modules in main path
2015-09-09 20:53:25 +02:00
Laurent Destailleur
2234d95a7b
Merge pull request #3481 from grandoc/develop
...
translations missing
2015-09-09 20:52:36 +02:00
Laurent Destailleur
615734012e
Merge pull request #3476 from marcosgdf/refactor
...
Refactor: Created hasDelay functions
2015-09-09 20:50:58 +02:00
Laurent Destailleur
a726cd210b
Merge pull request #3483 from GPCsolutions/sentry
...
Fix regression introduced by f3c71a9a5a
2015-09-09 20:10:01 +02:00
Laurent Destailleur
8c1760fbcf
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8
FIX Bad condition into invoice export request making reporting too many
...
rows.
2015-09-09 13:26:10 +02:00
Laurent Destailleur
3c91b8c890
Force to select "use personalized value" to select a personalized screen
...
option.
2015-09-09 12:39:06 +02:00
aspangaro
393d528be7
Merge remote-tracking branch 'Upstream/develop' into develop-64
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-08 21:17:54 +02:00
Juanjo Menent
5d401f275c
Merge pull request #3486 from GPCsolutions/debug
...
Qual: remove debug output
2015-09-08 19:54:42 +02:00
Florian HENRY
89b723b2a7
FIX : multientity warehouse management
2015-09-08 16:23:00 +02:00
Laurent Destailleur
24f7100562
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
aspangaro
16585553c1
Merge remote-tracking branch 'Upstream/develop' into develop-64
2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1
Add constant in modAccounting.class.php
2015-09-07 21:51:48 +02:00
Laurent Destailleur
82ad81fc03
Fix picto
2015-09-07 20:56:28 +02:00
Laurent Destailleur
9667b6a7c6
Solve conflict of var name
2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc
Fix memcached effect was lost because init was done each time.
2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c
Fix memcached effect was lost because init was done each time.
2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
71b98ffc0e
Qual: remove debug output
2015-09-07 17:15:41 +02:00
philippe grand
706f62d8f2
better display for code
2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
1168f0b6ae
Fix regression introduced by f3c71a9a5a
2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b
translations missing
2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5
translations missing
2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1
translations missing
2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714
translations missing
2015-09-07 15:29:51 +02:00
Laurent Destailleur
5d285bf56d
Merge pull request #3478 from grandoc/develop
...
translations missing
2015-09-07 15:09:31 +02:00
Laurent Destailleur
9cd5e7cafa
Fix some errors into code generator.
2015-09-07 15:03:38 +02:00
philippe grand
ff3968b07f
translations missing
2015-09-07 12:46:49 +02:00
Laurent Destailleur
a44ab5168c
Save memory.
2015-09-07 12:43:25 +02:00
Laurent Destailleur
28c62fb214
Introduce a function to return a warning by loggers.
2015-09-07 12:21:26 +02:00
Laurent Destailleur
f3c71a9a5a
Dolibarr must not contains autoload feature.
...
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
2015-09-07 12:09:42 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
47e62f2270
Created FactureFournisseur::hasDelay function
2015-09-06 18:47:26 +02:00
Laurent Destailleur
91ddca6ab0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2015-09-06 16:34:40 +02:00
Laurent Destailleur
822d4d1b39
Fix remove log
2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab
Fix error when mark rate is 100% and buying price is 0, no way to
...
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 15:00:17 +02:00
Laurent Destailleur
7c2b6e7780
Fix error when mark rate is 100% and buying price is 0, no way to
...
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 14:55:29 +02:00
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
