Commit Graph

37145 Commits

Author SHA1 Message Date
Laurent Destailleur
44268903a0 Fix: Pb in synchro update 2013-05-25 18:01:50 +02:00
Laurent Destailleur
c36f8a0149 Fix: cyclic updates 2013-05-25 17:28:31 +02:00
Laurent Destailleur
8e1feba425 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-25 17:15:17 +02:00
Laurent Destailleur
06f6f48147 Fix: Bug erase member data 2013-05-25 17:14:56 +02:00
Laurent Destailleur
e8f72fd401 Merge pull request #979 from defrance69/patch-9
Update modFournisseur.class.php
2013-05-25 01:52:30 -07:00
Laurent Destailleur
1a3a749ccb Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:12:17 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
2013-05-24 19:07:20 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
b9f5c15542 Fix: Bad link if not supplier defined for product 2013-05-24 18:49:40 +02:00
Laurent Destailleur
c97d1cb15b Try a fix for some browsers 2013-05-24 18:29:59 +02:00
Laurent Destailleur
6e634eb722 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-24 18:24:17 +02:00
Laurent Destailleur
92a7037c1d Fix: Missing translation 2013-05-24 18:20:28 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php
Add filter feature on the commande export
2013-05-24 16:17:36 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
Laurent Destailleur
a76c2f500e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-23 22:37:25 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +02:00
Laurent Destailleur
e9f964978d Merge pull request #974 from cbattarel/develop
fix bug when creating fichinter from order
2013-05-23 12:50:32 -07:00
Laurent Destailleur
44434e2689 Merge pull request #973 from atm-maxime/develop
Reset every month with @99 was not working properly.
2013-05-23 12:50:17 -07:00
Laurent Destailleur
6270a2e23c Try a fix for some browsers 2013-05-23 19:29:39 +02:00
Christophe Battarel
ebb8171d28 fix bug when creating fichinter from order (create function should receive $user as parm) 2013-05-23 11:36:00 +02:00
Maxime Kohlhaas
53c6638a90 Reset every month with @99 was not working properly. 2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
3b6c55f908 Fix: Param was renamed 2013-05-22 17:29:25 +02:00
Lukas Prömer
bb42f8384b Fix: 'rights' instead of 'right' 2013-05-22 16:31:50 +02:00
Laurent Destailleur
a9fe9cf0b2 Merge pull request #972 from LProemer/develop
Fix: 'rights' instead of 'right'
2013-05-22 07:28:26 -07:00
Laurent Destailleur
7856b7f613 Removed warning 2013-05-22 15:52:26 +02:00
Lukas Prömer
f1d9a6545c Fix: 'rights' instead of 'right' 2013-05-22 14:59:21 +02:00
Laurent Destailleur
99438926db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 12:24:05 +02:00
Laurent Destailleur
e9df560b74 New: Show process id in all command line scripts 2013-05-22 12:23:42 +02:00
Laurent Destailleur
469ae91e70 Fix: regression 2013-05-22 12:02:39 +02:00
Laurent Destailleur
d5d4bc33ba Merge pull request #971 from cbattarel/3.3
fix wrong construction of description when creating from orders
2013-05-22 02:57:34 -07:00
Laurent Destailleur
edf00db0e0 Merge pull request #970 from FHenry/develop
Add generic behaviour in showphoto of html.form.class.php
2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528 Merge pull request #968 from FHenry/3.3
3.3
2013-05-22 02:56:06 -07:00
Laurent Destailleur
f6f93eeec0 Merge pull request #967 from cbattarel/develop
add ability to include products on intervention card
2013-05-22 02:55:55 -07:00
Laurent Destailleur
f21b149361 Merge pull request #969 from FHenry/3.4
Fix bug in DDLCreateTable
2013-05-22 02:55:26 -07:00
Laurent Destailleur
0bffb6e654 Fix: Test error code 2013-05-22 11:43:16 +02:00
Laurent Destailleur
a61f6194ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-22 11:29:37 +02:00
Laurent Destailleur
0d562347fb Add a protection into test mode 2013-05-22 11:29:19 +02:00
simnandez
8d9b1e4788 Fix: Show date formatted 2013-05-22 10:51:45 +02:00
Christophe Battarel
992600664e fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:29:31 +02:00
Christophe Battarel
c69a44d6e9 fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:23:26 +02:00
Laurent Destailleur
961ce6e3e2 Fix: Removed error blocking redirect 2013-05-21 19:53:10 +02:00
fhenry
40827a7ef3 Add generic behaviour in showphoto of html.form.class.php 2013-05-21 14:52:39 +02:00
Laurent Destailleur
8fe45b1af6 Manifest usage is useless for a dynamic application like dolibarr. 2013-05-21 14:41:11 +02:00
fhenry
b36a16ed43 Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1 2013-05-21 14:32:30 +02:00
fhenry
13ad88832c Fix bug in DDLCreateTable 2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a Fix bug on DDLCreateDb in Mysql 2013-05-21 14:28:42 +02:00
Christophe Battarel
c97384d5db restore UNIX type (LF) 2013-05-21 12:32:41 +02:00