Laurent Destailleur
|
9314859ead
|
More log to find bug
|
2013-09-10 15:21:56 +02:00 |
|
Laurent Destailleur
|
345aa33efd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-10 14:20:15 +02:00 |
|
Laurent Destailleur
|
72557437ef
|
Checkstyle
|
2013-09-10 14:19:36 +02:00 |
|
Laurent Destailleur
|
38d3746c11
|
Merge pull request #1226 from GPCsolutions/dolidb
Added an abstract DolibDB class
|
2013-09-10 03:36:34 -07:00 |
|
Raphaël Doursenaud
|
5426db63ff
|
Added an abstract DolibDB class
|
2013-09-10 12:29:55 +02:00 |
|
Laurent Destailleur
|
598f6883a2
|
Doc comments
|
2013-09-10 11:39:20 +02:00 |
|
Laurent Destailleur
|
c147fc6016
|
Fix: checkstyle
Try phpcs into travis
|
2013-09-10 02:09:55 +02:00 |
|
Laurent Destailleur
|
2b8af33505
|
Fix: eof
|
2013-09-09 19:15:34 +02:00 |
|
Laurent Destailleur
|
d22985c5fa
|
More accurate log file
|
2013-09-09 12:23:15 +02:00 |
|
Laurent Destailleur
|
74a50d8d6c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-09-07 19:51:00 +02:00 |
|
Laurent Destailleur
|
bd24711b30
|
Fix: navigation of supplier invoices
|
2013-09-07 19:50:47 +02:00 |
|
Laurent Destailleur
|
3a8784a6de
|
Qual: Mutualize code
|
2013-09-07 19:08:08 +02:00 |
|
Laurent Destailleur
|
884965a679
|
Merge pull request #1218 from GPCsolutions/develop-review
Fixed bad copy-paste
|
2013-09-06 13:47:14 -07:00 |
|
Laurent Destailleur
|
91718bc902
|
Qual: Replace deprecated call ->form_confirm with ->formconfirm
|
2013-09-06 11:51:24 +02:00 |
|
Laurent Destailleur
|
87a4418baf
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-06 10:50:44 +02:00 |
|
Laurent Destailleur
|
9fa6d4ccdf
|
Fix: Avoid error for free products. Also add hidden otion to enable
this. In most cases, we don't want to do this.
|
2013-09-06 10:40:44 +02:00 |
|
Raphaël Doursenaud
|
ae36934746
|
Fixed bad copy-paste
|
2013-09-06 10:22:13 +02:00 |
|
Laurent Destailleur
|
38e4b0f9ac
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/debian/watch
|
2013-09-05 23:57:30 +02:00 |
|
Laurent Destailleur
|
d493dc8513
|
Merge pull request #1215 from GPCsolutions/develop-review
Develop review
|
2013-09-05 13:51:28 -07:00 |
|
Raphaël Doursenaud
|
36a281ce58
|
CSS fixes
|
2013-09-05 20:54:19 +02:00 |
|
Raphaël Doursenaud
|
8010389c08
|
Fixed wrong path in CSS
|
2013-09-05 20:29:06 +02:00 |
|
Raphaël Doursenaud
|
d39f2d655c
|
Typo fix: remove unwanted comma
|
2013-09-05 20:28:24 +02:00 |
|
Raphaël Doursenaud
|
0e8eddb470
|
Revert "Method should be static"
This reverts commit 4ca5bc3797.
|
2013-09-05 19:00:00 +02:00 |
|
Raphaël Doursenaud
|
6e64e0e7be
|
Fixed gd calls for windows bitmap images
|
2013-09-05 17:56:28 +02:00 |
|
Juanjo Menent
|
15bb60c8a1
|
Merge pull request #1212 from FHenry/develop
Add ref supplier into muscadet model
|
2013-09-05 08:30:49 -07:00 |
|
Raphaël Doursenaud
|
cd684460ff
|
Removed silly code
|
2013-09-05 17:30:17 +02:00 |
|
Raphaël Doursenaud
|
4efe215b0c
|
Qual: removed a bunch of duplicated array keys
|
2013-09-05 17:00:18 +02:00 |
|
Raphaël Doursenaud
|
465d59ba82
|
Don't call non static class statically
|
2013-09-05 16:44:57 +02:00 |
|
Raphaël Doursenaud
|
4ca5bc3797
|
Method should be static
|
2013-09-05 16:44:02 +02:00 |
|
Raphaël Doursenaud
|
0c0740cac7
|
Don't call non static class statically
|
2013-09-05 16:43:22 +02:00 |
|
Raphaël Doursenaud
|
109cc09e82
|
Simplified JS
|
2013-09-05 16:37:23 +02:00 |
|
Laurent Destailleur
|
e40d644085
|
Fix: Remove warning
|
2013-09-04 16:49:20 +02:00 |
|
Laurent Destailleur
|
10c2bdc193
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
|
2013-09-04 15:13:38 +02:00 |
|
Laurent Destailleur
|
af22d38681
|
Fix: Bad total without tax
|
2013-09-04 15:07:35 +02:00 |
|
Laurent Destailleur
|
ee0f44c9e3
|
Fix: Try a fix of cloning lines->array
|
2013-09-04 10:45:15 +02:00 |
|
Florian Henry
|
d8ddb8b3e7
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-03 20:07:13 +02:00 |
|
Florian Henry
|
b4d858828f
|
Add ref supplier into muscadet model
|
2013-09-03 20:07:08 +02:00 |
|
Laurent Destailleur
|
23df3d82e5
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-03 18:10:55 +02:00 |
|
Laurent Destailleur
|
3bfaadc054
|
Work on feature to change rule for vat calculation rounding
|
2013-09-03 18:08:50 +02:00 |
|
Juanjo Menent
|
7293d58002
|
Merge pull request #1208 from grandoc/develop
Add an additional description for the category products
|
2013-09-03 02:43:30 -07:00 |
|
Grand Philippe
|
6d6f30725b
|
Add an additional description for the category products
|
2013-09-03 11:41:33 +02:00 |
|
Laurent Destailleur
|
e40452f3b2
|
Fix: Bug if modules not enabled
|
2013-09-03 11:36:28 +02:00 |
|
Grand Philippe
|
dfdc9da781
|
Add an additional description for the category products
|
2013-09-03 11:15:19 +02:00 |
|
BENKE Charles
|
bb8f8332f9
|
Update modProjet.class.php
enhance export feature with
left join and projet_task_time data
|
2013-09-03 11:12:29 +02:00 |
|
Grand Philippe
|
da384dda18
|
uniformize
|
2013-09-02 11:53:07 +02:00 |
|
Laurent Destailleur
|
cb52af4f47
|
Qual: Make code more generic
|
2013-09-02 02:14:16 +02:00 |
|
Laurent Destailleur
|
b95aa1ac7b
|
Fix: select list on external table
Conflicts:
htdocs/core/class/extrafields.class.php
|
2013-09-02 00:41:14 +02:00 |
|
Laurent Destailleur
|
3a4896609a
|
Fix: Remove debug print
|
2013-09-02 00:38:13 +02:00 |
|
Laurent Destailleur
|
e6611b6ba1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-09-02 00:34:55 +02:00 |
|
Laurent Destailleur
|
51cc957b97
|
Fix: select list on external table
|
2013-09-02 00:34:41 +02:00 |
|