lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,704 Commits 43 Branches 150 Tags 886 MiB
bcd441cc1e
Commit Graph

42704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Laurent Destailleur
a6992e116b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
 2014-07-18 23:24:39 +02:00
Laurent Destailleur
dbae31b982 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
44e57ca08a Fix: Seach on company was not working 2014-07-18 18:21:09 +02:00
Marcos García de La Fuente
e2912b5f7f Accidentally removed Demo trigger content 2014-07-18 07:10:05 +02:00
Marcos García de La Fuente
5c59d291ce Corrected CS errors 2014-07-18 04:16:34 +02:00
Marcos García de La Fuente
f8f9e0355c Refactor InterfaceActionsAuto 2014-07-18 04:10:43 +02:00
Marcos García de La Fuente
0c4a3b23af Corrected test 2014-07-18 03:52:30 +02:00
Marcos García de La Fuente
f7c1203d4c Refactored InterfaceNotification class 2014-07-18 03:29:20 +02:00
Marcos García de La Fuente
cbd10106b8 Added missing $error and $errors variables 2014-07-18 03:17:05 +02:00
Marcos García de La Fuente
7e29889eab Fixed little bug 2014-07-18 03:13:15 +02:00
Marcos García de La Fuente
dfd8b5e20c Converted some global variables to local ones in InterfaceLogevents 2014-07-18 03:11:28 +02:00
Marcos García de La Fuente
c11431177c Fixed trigger not returning anything under some circumstances 2014-07-18 03:04:01 +02:00
Marcos García de La Fuente
2f68afaff3 Removed useless code 2014-07-18 03:02:28 +02:00
Marcos García de La Fuente
c8338f45c4 Refactored Dolibarr triggers: 
Created a DolibarrTriggers abstract class.
Moved common variables out of construct class
Improved run_trigger method signature
 2014-07-18 02:59:46 +02:00
Marcos García de La Fuente
63585ea9ca Added missing doActions for supplier order fiche.php 2014-07-18 01:32:54 +02:00
Marcos García de La Fuente
bcafa2c790 Corrected file_exists check and little refactor 2014-07-17 21:44:59 +02:00
Marcos García de La Fuente
37d4d303b3 Updated is_ip comment and added a test for is_ip function 2014-07-17 21:19:03 +02:00
Marcos García de La Fuente
cdc40ca76f Optimized is_ip dolibarr function 2014-07-17 21:12:50 +02:00
Juanjo Menent
2564413a70 Fix: Translation 2014-07-17 11:44:10 +02:00
Juanjo Menent
6e1f6f7485 Trad: Update es_ES from transifex 2014-07-17 11:14:47 +02:00
Laurent Destailleur
ef2629d309 Fix: Translation 2014-07-17 02:02:35 +02:00
Laurent Destailleur
9394f3f405 Fix: Translation 2014-07-17 01:56:34 +02:00
Laurent Destailleur
1bad6ebc78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-17 01:29:30 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Laurent Destailleur
6a19cc614a Merge pull request #1737 from GPCsolutions/accessibility 
Accessibility
 2014-07-16 15:15:03 +02:00
Laurent Destailleur
a6a799c812 Merge pull request #1747 from KreizIT/Fix_batch 
FIX stock inconsistency when activating batch management
 2014-07-16 15:13:23 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
f096253a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-15 23:28:58 +02:00
Laurent Destailleur
0cb11a537d Fix: IP address of user was lost into paypal confirm email 2014-07-15 23:27:11 +02:00
Cedric
f38ab46928 correction typo 2014-07-15 19:02:43 +02:00
Marcos García de La Fuente
ad4512cb24 Avoiding include in case of unexisting file 2014-07-15 17:18:41 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Laurent Destailleur
3a625ce6bf Merge pull request #1741 from marcosgdf/url-not-available 
Removed index.php and replaced them with blank index.html as it is more appropiate
 2014-07-14 23:20:32 +02:00
Laurent Destailleur
0025b507a7 Merge pull request #1738 from marcosgdf/vagrant 
Updated Vagrant box
 2014-07-14 23:16:08 +02:00
Laurent Destailleur
32a6d59b64 Merge pull request #1734 from FHenry/3.5 
Fix
 2014-07-14 23:13:03 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Laurent Destailleur
d02df05ab8 Merge branch 'marcosgdf-bug-1526' into 3.5 2014-07-14 23:10:05 +02:00
Laurent Destailleur
0bfc90ee9a Merge pull request #1744 from marcosgdf/bug-linkedprojects 
Fixed a bug introduced in commit 0916d2cf3b
 2014-07-14 23:05:16 +02:00
Cedric
dda17f4082 Security fix 2014-07-14 20:00:22 +02:00
Juanjo Menent
2ac088d60e Merge pull request #1739 from KreizIT/XssFix 
Security fix
 2014-07-14 19:58:48 +02:00
Juanjo Menent
2031cdfdd7 Merge pull request #1745 from ndrosis/patch-2 
Fix Link product
 2014-07-14 19:48:37 +02:00
Juanjo Menent
ccf32636f8 Fix: Import ProfId1 to siren and ProfId2 to siret 
Conflicts:
	ChangeLog
 2014-07-14 19:43:59 +02:00
Juanjo Menent
9410b18473 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:43:48 +02:00
Juanjo Menent
3a8835892e Fix: Import ProfId1 to siren and ProfId2 to siret 
Conflicts:
	ChangeLog
 2014-07-14 19:42:54 +02:00
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3816e0fe14 Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:39:08 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00