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

44184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6bbeaee8fe Fix: Selection of users color was not user owner of event. 2014-10-18 15:35:32 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Frédéric FRANCE
889dbec97b Use javascript On/Off tosell-tobuy if enabled 2014-10-18 15:07:38 +02:00
Laurent Destailleur
6a9d825a65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 14:57:49 +02:00
Laurent Destailleur
85ce8f8fef Merge pull request #1959 from aspangaro/develop-usercolor 
Add field to select color of the user in user's card
 2014-10-18 14:57:19 +02:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or 
error of images.
 2014-10-18 14:56:06 +02:00
Laurent Destailleur
97f98d7e16 Merge pull request #1955 from frederic34/patch-2 
Ajax On/Off for product tosell and tobuy
 2014-10-18 14:18:14 +02:00
Laurent Destailleur
3528049348 Merge pull request #1961 from FHenry/3.6 
Fix right and error management
 2014-10-18 14:15:13 +02:00
Laurent Destailleur
79c6d50668 Merge pull request #1962 from IonAgorria/patch-1 
Added date start/end at webservice createOrder
 2014-10-18 14:11:39 +02:00
Laurent Destailleur
fb76fc94b5 Merge pull request #1963 from defrance69/patch-24 
Update functions2.lib.php
 2014-10-18 14:11:25 +02:00
Laurent Destailleur
14ea66f3b7 Legend 2014-10-18 02:31:48 +02:00
Laurent Destailleur
b43d96f86c New: Add id into select_category method. 2014-10-18 02:12:10 +02:00
Laurent Destailleur
58b15fa736 Fix: Solve some regressions 2014-10-18 01:32:38 +02:00
Laurent Destailleur
dbbf31d87b Fix: Restore comaptibility with all languages. 
Fix: Corrupting data function.
 2014-10-18 00:41:21 +02:00
Laurent Destailleur
f7b1115ab0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 00:34:23 +02:00
Laurent Destailleur
f49f9e24b7 Removed useless log and removed REQUEST. 2014-10-18 00:34:08 +02:00
Laurent Destailleur
a2d23fd699 Fix: Error management of hook was duplicating errors. 2014-10-18 00:33:30 +02:00
Juanjo Menent
5dbdb50cd7 Trad: Syncro es_ES from Transifex 2014-10-17 20:35:49 +02:00
BENKE Charles
8095bbf809 Update functions2.lib.php 2014-10-17 17:10:12 +02:00
Laurent Destailleur
e2afa48caa Fix: avoid warning 2014-10-17 16:23:32 +02:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
Laurent Destailleur
fb04b1aedb More spaced cells 2014-10-17 14:47:17 +02:00
Laurent Destailleur
8581e953f9 Doxygen 2014-10-17 14:45:12 +02:00
Laurent Destailleur
5513a44a07 Fix: translation. Use "template" instead of "pre-defined" 2014-10-17 14:17:52 +02:00
Laurent Destailleur
f1e4f35471 Minor fixes on intervention sql 
No style on view for one day.
 2014-10-17 13:09:18 +02:00
Laurent Destailleur
78d289110d Trans: Same verb 2014-10-17 13:07:23 +02:00
Laurent Destailleur
7988532e4e Fix: Bad closing tab on preview pages. 2014-10-17 12:56:54 +02:00
BENKE Charles
589a3fdf95 Update functions2.lib.php 2014-10-17 10:26:34 +02:00
BENKE Charles
5bd665f10d Update functions2.lib.php 
disable entity filter fields for module who not use multicompany fields
 2014-10-17 09:53:17 +02:00
Laurent Destailleur
e2524fbf77 Fxi: Filter on list view was not correct. 2014-10-16 21:34:35 +02:00
aspangaro
b4a9e6a119 Fix :: Administrator not created on new install 2014-10-16 21:14:57 +02:00
aspangaro
01957de5a2 Merge remote-tracking branch 'Upstream/develop' into develop-usercolor 2014-10-16 21:13:14 +02:00
Laurent Destailleur
7a68d9a940 Miscellaneous fixes 2014-10-16 20:55:13 +02:00
Cubexed
08c9ff275a Added date start/end at webservice createOrder 2014-10-16 18:09:16 +02:00
Florian HENRY
eeffe4ed34 Reload object when product clone failed (cause of ref already exists) if 
not done result is blanck pages (header wannot be rewrite (location
herder index.php) around line 1542
 2014-10-16 13:57:07 +02:00
Maxime Kohlhaas
8e3a3500c2 Add comments (for travis' sake) 2014-10-16 13:28:39 +02:00
aspangaro
18426ab8fc Merge remote-tracking branch 'Upstream/develop' into develop-usercolor 2014-10-16 06:36:39 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Laurent Destailleur
c8dd0383d8 New: Function getCurrencyAmount is marked as deprecated. Use function 
price to output a price including currency symbol.
 2014-10-16 01:26:44 +02:00
Laurent Destailleur
b90011aeb1 Add function dolEscapeXML 2014-10-16 01:21:10 +02:00
aspangaro
2f4822e73b Merge 2014-10-15 20:43:32 +02:00
Laurent Destailleur
ec18bd3845 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-15 18:43:05 +02:00
Laurent Destailleur
38e4100e47 Better translation: Virtual product is a "package product". 2014-10-15 18:21:18 +02:00
Laurent Destailleur
5d57c59241 Fix: Bad parameter of get_substitutionarray_other 2014-10-15 18:16:41 +02:00
Teddy
5de7bfffa6 Merge pull request #1 from Dolibarr/develop 
MAJ BRANCHE DEV
 2014-10-15 17:07:28 +02:00
Florian HENRY
722f6e0db6 Fix right on product list 2014-10-15 15:24:31 +02:00
Maxime Kohlhaas
737cafef4e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 2014-10-15 15:02:36 +02:00
Regis Houssin
a1210da513 Fix: missing entity in unique index 2014-10-14 20:19:02 +02:00
Maxime Kohlhaas
850771206d Changelog :) 2014-10-14 17:12:45 +02:00