Commit Graph

37011 Commits

Author SHA1 Message Date
Laurent Destailleur
b8b56e2d26 Fix: col balance 2014-08-14 13:25: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
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
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
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
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into
KreizIT-task712

Conflicts:
	ChangeLog
2014-08-14 00:18:51 +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
e0a874b5fd Merge pull request #1808 from KreizIT/GETPost_review
Add improvement to GETPOST function
2014-08-13 23:44:58 +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
Laurent Destailleur
454cb1cbf8 Enhance skeleton
Add code_iso3 into array
2014-08-13 19:19:36 +02:00
Laurent Destailleur
6727385765 Fix: error message 2014-08-13 15:07:22 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
aspangaro
b465d71535 Renamed data table 2014-08-13 07:46:56 +02:00
Florian HENRY
3c96063165 fix travis 2014-08-12 18:38:27 +02:00
Florian HENRY
ca05345a60 Fix Travis 2014-08-12 18:20:36 +02:00
Florian HENRY
bab7533578 Enable supplier price log table 2014-08-12 18:16:59 +02:00
Florian HENRY
db7478098a Add a real free numbering module for contract 2014-08-12 13:26:06 +02:00
Florian HENRY
eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-12 12:37:31 +02:00
Andrelec1
49d1983acd trigger on total
Add hook on js for total
2014-08-12 11:40:24 +02:00
Andrelec1
1ce4996a34 finish implement
remove old code and add new one ...
2014-08-12 11:34:53 +02:00
aspangaro
f7c31d651c Correct 2014-08-11 20:34:07 +02:00
aspangaro
e3ced8487a Correct 2014-08-11 20:33:13 +02:00
aspangaro
f2b9b8b1bb Correct 2014-08-11 20:06:10 +02:00
Laurent Destailleur
723bad0ece Fix: colspan 2014-08-11 18:22:00 +02:00
Andrelec1
3548f72d8a Start implement 2014-08-11 18:14:40 +02:00
Laurent Destailleur
bb355ec7bd Fix: Do not force size. Must be done by function or css. 2014-08-11 18:06:23 +02:00
Laurent Destailleur
8630f397bc Fix: Do not force size. Must be done by function or css. 2014-08-11 18:02:17 +02:00
Laurent Destailleur
526066803c New: Function dol_delete_dir_recursive accept new param $onlysub 2014-08-11 15:20:07 +02:00
aspangaro
671f8e0be5 Correct 2014-08-11 14:03:30 +02:00
aspangaro
7d433f9845 Correct 2014-08-11 13:50:16 +02:00
aspangaro
48006cb42d Correct 2014-08-11 13:27:27 +02:00
aspangaro
6fd77e7ef6 Merge branch 'Upstream/develop' 2014-08-11 13:26:58 +02:00
Laurent Destailleur
4ce2495a33 Fix: Parameter morefilter is missing. 2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86 New: Select list of users can return user into hierarchy. 2014-08-11 11:29:47 +02:00
Laurent Destailleur
4d9c72f944 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-11 10:50:36 +02:00
Laurent Destailleur
8205a0e1b5 Fix: Better comment and var name 2014-08-11 10:50:08 +02:00
Maxime Kohlhaas
c207daa18c Revert invoice list 2014-08-11 10:07:09 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00