Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Regis Houssin
a20f7094ef Fix: refactore 2012-10-09 18:11:51 +02:00
Regis Houssin
74dd4ce218 Fix: possibility to force the clause 2012-10-09 18:06:59 +02:00
Regis Houssin
337cb0faa5 Fix: add not exact method 2012-10-09 17:47:58 +02:00
Regis Houssin
9f43d8613c Fix: missing clean parameters 2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d Fix: missing spaces 2012-10-09 16:33:28 +02:00
Regis Houssin
7cde9ab668 New: add search method with case sensibility and filters 2012-10-09 15:49:42 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Laurent Destailleur
4413613d14 Another better fix. 2012-10-09 11:56:39 +02:00
Laurent Destailleur
1725561c34 Better security fix: Using GETPOST does not fix all cases, also the real 
bug (missing escaping information when using it) was not fixed.
 2012-10-09 11:42:38 +02:00
Regis Houssin
72a1194d14 Fix: search with case sensitive method 
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
 2012-10-09 10:57:15 +02:00
Regis Houssin
a814ea7924 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-09 09:34:57 +02:00
Regis Houssin
4cd702bb1a Fix: prevent XSS and SQL injection 2012-10-09 09:34:12 +02:00
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop 
Task # 186 : Forgot to add the new box in the mod definition...
 2012-10-08 23:50:49 -07:00
Regis Houssin
bfee8553f0 Merge pull request #445 from atm-maxime/mko543 
Bug # 543 and # 570 : contact address is now used in recipient block and...
 2012-10-08 23:50:29 -07:00
Regis Houssin
d61a8ee947 Fix: missing comma 2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5 Fix: add import_key field 2012-10-09 08:40:32 +02:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
93d760e0fc Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-08 20:44:28 +02:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +02:00
Laurent Destailleur
d51db70768 Missing translation 2012-10-08 20:25:03 +02:00
Laurent Destailleur
26f4b344cb Merge pull request #444 from cbattarel/develop 
fix wrong update in previous commit
 2012-10-08 10:55:33 -07:00
Regis Houssin
c35a1ebaf7 Fix: missing drop foreign key 2012-10-08 19:38:09 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
99b323e8d0 fix wrong update in previous commit 
(it was always remaining on step 5 !)
 2012-10-08 16:25:50 +02:00
Regis Houssin
67c41721f5 Merge pull request #443 from marcosgdf/translations 
Minor changes to es_ES translations
 2012-10-08 03:01:57 -07:00
Regis Houssin
88785a8fef Merge pull request #442 from cbattarel/develop 
fix wrong last update in cleansep function
 2012-10-08 03:01:34 -07:00
Marcos García
fed3c20548 Minor changes to es_ES translations 2012-10-08 11:44:55 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Marcos García
734b292440 Merge branch 'develop' into bug-569 
Conflicts:
	htdocs/install/inc.php
 2012-10-08 11:16:33 +02:00
Marcos García
8ed706e4ac Fixed bug #569 - Notices & Warnings when installing Dolibarr 
Also translated a string & variable and improved html use
 2012-10-08 02:45:58 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg. 
Fix: Debian package
 2012-10-07 20:04:07 +02:00
Laurent Destailleur
566855d7e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2012-10-06 23:15:10 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
430b63f4e1 Fix: Bad message 2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1 Fix: Usage of specific mysql function is forbidden 2012-10-06 22:46:54 +02:00
Laurent Destailleur
053b4dd63c New: [ task #210 ] Can choose cash account during POS login 2012-10-06 21:47:59 +02:00
Laurent Destailleur
b2ec0a7669 Merge pull request #438 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-10-06 11:16:23 -07:00
Laurent Destailleur
a659e6f9f7 More elegant position of button to aufofill fields. 2012-10-06 19:25:25 +02:00
simnandez
7faa90e831 New: More import options. Prepare database 2012-10-06 09:52:33 +02:00
simnandez
2d4957d415 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-10-06 09:38:09 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
simnandez
0e5cc34b1f Trad: Add ca_ES and es_ES translations 2012-10-05 18:50:30 +02:00
Regis Houssin
b1ad840055 Fix: optimize code 2012-10-05 15:12:17 +02:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-05 12:40:19 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00