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

45118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Laurent Destailleur
aee35c86d6 Perf: Removed a useless distinct, add indexes. 2014-08-15 02:11:01 +02:00
Laurent Destailleur
823825075e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-15 01:33:43 +02:00
Laurent Destailleur
37cc0dc4f3 Perf: Add missing index on projet_task_time table. 2014-08-15 01:32:18 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
Andrelec1
1ffb964dd1 Change method 
Replace by existing constant ..
 2014-08-14 16:06:43 +02:00
Laurent Destailleur
c17f5e7f00 Accept property fk_thirdparty instead of fk_soc 2014-08-14 16:04:42 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Laurent Destailleur
75a46030de Complete ignore 2014-08-14 15:09:17 +02:00
Maxime Kohlhaas
e760201a59 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-14 14:26:01 +02:00
Maxime Kohlhaas
c6637207f8 Fix : VAT and NPR rates where coming from multiprice... 2014-08-14 14:25:41 +02:00
Laurent Destailleur
6b26ae6f1f Fix: Header of tables must use th and not td 2014-08-14 13:30:44 +02:00
Laurent Destailleur
5a0c66b9ad Qual: Use getNomUrl for project into list of timesheet. 2014-08-14 13:29:24 +02:00
Laurent Destailleur
4c0059266c Prepare to remove pair and impair css style. 2014-08-14 13:26:59 +02:00
Laurent Destailleur
b8b56e2d26 Fix: col balance 2014-08-14 13:25:54 +02:00
BENKE Charles
5d81eca1a3 change option name 
replace
MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES
by
MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES
 2014-08-14 10:47:28 +02:00
Raphaël Doursenaud
739d309a0d Updated category fix 
Categories ID can be passed as strings
PSR code formatting
 2014-08-14 08:46:51 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Raphaël Doursenaud
1a9e98cda9 Fix categories bug 
When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
 2014-08-14 08:33:39 +02:00
aspangaro
fe3939debe Drop old index 2014-08-14 06:42:28 +02:00
Laurent Destailleur
91900f54c2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-14 01:54:23 +02:00
Laurent Destailleur
387c123229 Fix: List of colors was too low. 2014-08-14 01:53:54 +02:00
Laurent Destailleur
dfe0052e27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-14 01:43:32 +02:00
Laurent Destailleur
32e7c91b2b New: Add key for translation of module accounting expert 2014-08-14 01:43:12 +02:00
Laurent Destailleur
d6c4993c40 Merge pull request #1822 from Devensys/Devlop-PayTotalButton 
Add button to fill amount paiement
 2014-08-14 01:28:20 +02:00
Laurent Destailleur
52630dca7d Merge branch 'aspangaro-develop-favorite' into develop 2014-08-14 01:06:03 +02:00
Laurent Destailleur
80a68a8295 Update changelog 2014-08-14 01:05:37 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
Laurent Destailleur
1fad543f67 Merge branch 'aspangaro-develop-accounting3' into develop 2014-08-14 01:00:16 +02:00
Laurent Destailleur
de3d66eaeb Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-08-14 00:59:48 +02:00
Laurent Destailleur
64513c10d9 Fix: Can drag from last day of event. 2014-08-14 00:57:59 +02:00
Laurent Destailleur
40349a9f53 Fix: Removed bad char 2014-08-14 00:55:27 +02:00
Laurent Destailleur
b35b5690c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-14 00:24:48 +02:00
Laurent Destailleur
3cc3d4d82f Merge branch 'KreizIT-task1218' into develop 2014-08-14 00:24:26 +02:00
Laurent Destailleur
69d23b3ea0 Merge branch 'task1218' of github.com:KreizIT/dolibarr into 
KreizIT-task1218

Conflicts:
	ChangeLog
 2014-08-14 00:24:08 +02:00
Laurent Destailleur
abb845b579 Merge pull request #1813 from atm-maxime/mkoevols 
Add payment mode in invoice list
 2014-08-14 00:21:34 +02:00
Laurent Destailleur
351705b76b Merge pull request #1812 from atm-maxime/mkoshipment 
New : After commit b7ee10a074 don't add pr...
 2014-08-14 00:20:31 +02:00
Laurent Destailleur
4343d82874 Merge branch 'KreizIT-task712' into develop 2014-08-14 00:19:06 +02:00
Laurent Destailleur
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into 
KreizIT-task712

Conflicts:
	ChangeLog
 2014-08-14 00:18:51 +02:00
Laurent Destailleur
0b2a81f4b8 Merge pull request #1821 from astebert/patch-1 
Update bills.lang
 2014-08-14 00:09:55 +02:00
Laurent Destailleur
e3f96802fb Fix: sql bad use. 
Qual: Incrase sql syntax test by phpunit to migration scripts. 
Qual: Removed old migration script before 3.0.0
 2014-08-14 00:09:09 +02:00
Laurent Destailleur
e424ae5b86 Merge pull request #1760 from FHenry/develop 
Remane contract ref_ext to ref_supplier
 2014-08-13 23:54:19 +02:00
Laurent Destailleur
3729178173 Merge pull request #1819 from FHenry/3.6 
Fix bug in output extrafields sell list
 2014-08-13 23:51:35 +02:00
Laurent Destailleur
e0a874b5fd Merge pull request #1808 from KreizIT/GETPost_review 
Add improvement to GETPOST function
 2014-08-13 23:44:58 +02:00
Laurent Destailleur
230dd3d4eb Merge pull request #1824 from FHenry/3.5 
Fix: Missing include files.lib.php in some pages to use dol_delete_recursive
 2014-08-13 23:41:04 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
bcc0f244f0 Fix: Used wrong image 2014-08-13 19:21:31 +02:00