Laurent Destailleur
|
395066519b
|
Fix: [ bug #1163 ] SQL Error when searching for supplier orders
|
2013-12-01 16:18:18 +01:00 |
|
Laurent Destailleur
|
b6386a3dce
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
|
2013-12-01 16:08:03 +01:00 |
|
Laurent Destailleur
|
d39ed05c5d
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/comm/propal/list.php
|
2013-12-01 16:05:09 +01:00 |
|
Laurent Destailleur
|
8d1e10cd76
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-12-01 16:02:19 +01:00 |
|
Laurent Destailleur
|
cbf1ddaa17
|
Fix: [ bug #1079 ] External users can't access projects even if it is a
contact.
|
2013-12-01 16:01:33 +01:00 |
|
Laurent Destailleur
|
833fb1a126
|
Fix: When editing thirdparty, result is not refreshed
|
2013-12-01 15:46:15 +01:00 |
|
Laurent Destailleur
|
25f49b6a24
|
Fix: bad test
|
2013-12-01 15:29:07 +01:00 |
|
Laurent Destailleur
|
f86cf6c440
|
Check parameters of script
|
2013-12-01 15:22:47 +01:00 |
|
Laurent Destailleur
|
71a85464d5
|
Check parameters of script
|
2013-12-01 15:22:29 +01:00 |
|
Laurent Destailleur
|
a7c246cec1
|
Check parameters of script
|
2013-12-01 15:21:58 +01:00 |
|
Laurent Destailleur
|
8e51a4683f
|
Check parameters of script
|
2013-12-01 15:20:57 +01:00 |
|
Laurent Destailleur
|
519919889c
|
Fix comment
|
2013-11-30 16:57:11 +01:00 |
|
Laurent Destailleur
|
e0dd3090c9
|
Remove hardcoded strings
|
2013-11-30 10:58:43 +01:00 |
|
Laurent Destailleur
|
abec634960
|
Look: Better support for jmobile
|
2013-11-30 02:31:17 +01:00 |
|
Raphaël Doursenaud
|
e24555822e
|
Fixed install generated $dolibarr_main_url_root_alt path
We now use relative paths.
So let's remove the absolute part from the install generated configuration file.
|
2013-11-29 17:28:17 +01:00 |
|
Raphaël Doursenaud
|
771d576e2b
|
Better error wording
|
2013-11-29 17:23:42 +01:00 |
|
Laurent Destailleur
|
3f89f27a0c
|
Merge pull request #1329 from GPCsolutions/vagrant
Vagrant
|
2013-11-29 06:38:48 -08:00 |
|
Raphaël Doursenaud
|
b391de1b23
|
Added initdata info to vagrant readme
|
2013-11-29 15:27:04 +01:00 |
|
Raphaël Doursenaud
|
507e648adb
|
Use latest release initdata
|
2013-11-29 15:24:29 +01:00 |
|
Raphaël Doursenaud
|
0f34f81dc7
|
Moved VM vhost to dev.dolibarr.org
This helps avoid Google Chrome doing a search instead of an HTTP request
|
2013-11-29 15:22:31 +01:00 |
|
Raphaël Doursenaud
|
cb210650de
|
Added more information about the dolibarrdev vagrant box
|
2013-11-29 15:22:30 +01:00 |
|
Raphaël Doursenaud
|
694eeeb2bb
|
Fixed vagrant shared folder permissions
|
2013-11-29 15:22:30 +01:00 |
|
Raphaël Doursenaud
|
9bba60ebee
|
Added basic readme about Vagrant
|
2013-11-29 15:22:30 +01:00 |
|
Raphaël Doursenaud
|
37031410f9
|
Ignore vagrant generated files
|
2013-11-29 15:22:30 +01:00 |
|
Raphaël Doursenaud
|
0f9c616890
|
Added vagrant development box
|
2013-11-29 15:22:30 +01:00 |
|
Laurent Destailleur
|
e4860679de
|
Merge pull request #1327 from FHenry/3.4
[ bug #1159 ] Commercial search "other" give p.note do not exists
|
2013-11-29 03:18:13 -08:00 |
|
Cédric Salvador
|
22d31817de
|
made getVATRates synchronous to avoid concurrency problems
|
2013-11-29 12:13:23 +01:00 |
|
Maxime Kohlhaas
|
e26d45539b
|
Merge branch '3.5' of github.com:Dolibarr/dolibarr into develop
|
2013-11-29 12:05:10 +01:00 |
|
Maxime Kohlhaas
|
f6aa04d5ef
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2013-11-29 12:04:05 +01:00 |
|
Laurent Destailleur
|
e27d109f2d
|
Merge pull request #1328 from csalvador/develop-fixAJAX
Develop fix ajax
|
2013-11-29 02:59:11 -08:00 |
|
Laurent Destailleur
|
b3ff58e864
|
Merge pull request #1330 from grandoc/3.5
fix management of all errors message
|
2013-11-29 02:58:21 -08:00 |
|
Laurent Destailleur
|
ecd14cb751
|
Merge pull request #1326 from grandoc/3.5
3.5
|
2013-11-29 02:58:06 -08:00 |
|
Grand Philippe
|
d024ec3daa
|
fix management of all errors message
|
2013-11-29 11:29:39 +01:00 |
|
Grand Philippe
|
438d7b0fb2
|
fix regression
|
2013-11-29 11:04:22 +01:00 |
|
Grand Philippe
|
c0650d6da3
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-29 08:30:46 +01:00 |
|
Laurent Destailleur
|
a0c0578863
|
No need to send email for each error. First one is enough.
|
2013-11-28 19:06:34 +01:00 |
|
Laurent Destailleur
|
ea51e9ec77
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-28 18:57:43 +01:00 |
|
Laurent Destailleur
|
d0b05bb5af
|
Fix: Restore style code lost by a commit.
|
2013-11-28 18:55:36 +01:00 |
|
Laurent Destailleur
|
5715e9c986
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-28 17:06:11 +01:00 |
|
Laurent Destailleur
|
d1e62bebf0
|
Fix: Removed a merged that we ddidn't want.
|
2013-11-28 17:01:37 +01:00 |
|
Grand Philippe
|
5b2f9af7dc
|
fix management of all errors messages
|
2013-11-28 16:44:57 +01:00 |
|
Grand Philippe
|
1ac5bd3f28
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-28 16:39:29 +01:00 |
|
Laurent Destailleur
|
bdf8100d84
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
|
2013-11-28 15:54:12 +01:00 |
|
Cédric Salvador
|
ec3fc4e6e6
|
indentation
|
2013-11-28 15:53:28 +01:00 |
|
Cédric Salvador
|
2da88a2966
|
made getVATRates synchronous to avoid concurrency problems
|
2013-11-28 15:52:26 +01:00 |
|
Raphaël Doursenaud
|
a7afe07538
|
Scripts should be executable
|
2013-11-28 15:17:58 +01:00 |
|
Raphaël Doursenaud
|
9ae9a02b95
|
SQL files shouldn't be executable
|
2013-11-28 15:17:39 +01:00 |
|
philippe
|
d5606b6045
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
|
2013-11-28 15:09:16 +01:00 |
|
Laurent Destailleur
|
a3e55822a4
|
Missing translation
|
2013-11-28 14:36:13 +01:00 |
|
Florian Henry
|
b9d37fd6f7
|
[ bug #1159 ] Commercial search "other" give p.note do not exists
|
2013-11-28 14:28:03 +01:00 |
|