Commit Graph

32661 Commits

Author SHA1 Message Date
Laurent Destailleur
e47accd87b Qual: Removed deprecated code 2012-08-07 14:13:59 +02:00
Laurent Destailleur
fac878ca69 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 13:13:30 +02:00
Laurent Destailleur
803f840761 Qual: Rename label to avoid confusion.
Qual: Fix code to reflect documentation.
2012-08-07 13:12:20 +02:00
Regis Houssin
5564421e3f Fix: update method return $this->error not $this->errors 2012-08-07 12:00:22 +02:00
Regis Houssin
71a4a2b7f9 Fix: dol_htmloutput_events() already loaded in footer 2012-08-07 11:48:28 +02:00
Laurent Destailleur
edbfd7d4f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 11:33:53 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Regis Houssin
fd2a06bc6b Merge pull request #296 from cbattarel/develop
also take lines without buying_price in commissions
2012-08-07 01:14:00 -07:00
Christophe Battarel
cbd54291b1 also take lines without buying_price in commissions 2012-08-07 09:46:26 +02:00
Laurent Destailleur
e3ed088355 Merge pull request #294 from marcosgdf/minor
Added missing change in changelog
2012-08-06 17:24:01 -07:00
Marcos García
26e9a5c877 Added missing change in changelog 2012-08-07 00:59:20 +02:00
Regis Houssin
85e8c6f8d6 Merge pull request #293 from marcosgdf/translations
Added missing translation
2012-08-06 12:51:55 -07:00
Marcos García
d5ce19840c Added missing translations 2012-08-06 21:22:45 +02:00
Regis Houssin
f814e4e25f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-06 20:42:27 +02:00
Regis Houssin
f6a4277525 Fix: remove unused file and missing print 2012-08-06 20:38:03 +02:00
Laurent Destailleur
1e28904d56 New: task #185 : Can input amount when correcting stock to recalculate
PMP.
2012-08-06 19:41:03 +02:00
Laurent Destailleur
0ad8f31899 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-06 19:24:40 +02:00
Laurent Destailleur
49f8f07737 Start to work on bug [ bug #251 ] and [ bug #260 ]. 2012-08-06 19:22:14 +02:00
Regis Houssin
67d90d9de2 Merge pull request #292 from atm-maxime/mko185
Mko185
2012-08-06 10:03:59 -07:00
Regis Houssin
58878cdb6f Fix: update jquery fileupload 2012-08-06 18:43:34 +02:00
Maxime Kohlhaas
c2b38e8415 task #185 2012-08-06 18:11:00 +02:00
Regis Houssin
d830041441 Fix: missing object 2012-08-06 17:43:14 +02:00
Maxime Kohlhaas
e8a3af017e task #185 : Can input HT amount when correcting stock to recalculate PMP 2012-08-06 17:10:55 +02:00
Regis Houssin
1b2e6aa5e4 Fix: remove draft status if invoice is validated 2012-08-06 09:13:50 +02:00
Regis Houssin
a0ac6873ed Fix: use doliforge instead savannah 2012-08-06 08:17:36 +02:00
Regis Houssin
e140724738 Fix: avoid warning 2012-08-06 08:13:58 +02:00
Laurent Destailleur
816e317dd2 Fix into categorie functions 2012-08-05 23:58:42 +02:00
Laurent Destailleur
e53ae6eea2 Fix: W3C 2012-08-05 21:59:45 +02:00
Laurent Destailleur
76cdb809cc Fix: syntax error 2012-08-05 21:30:40 +02:00
Laurent Destailleur
cc76ea1f66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 21:14:52 +02:00
Laurent Destailleur
3af27d17ab Add param to force to hide menu from login page 2012-08-05 21:14:17 +02:00
Laurent Destailleur
4d59ecb049 Fix: Missing condition 2012-08-05 21:06:48 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files
(minimum for possibility to merge with 3.2)
2012-08-05 20:41:11 +02:00
Laurent Destailleur
9e6a9f1b12 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 19:08:49 +02:00
Regis Houssin
2884aac4bc Fix: delete pdf if supplier invoice is deleted
Fix: compatibility with external modules

Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2012-08-05 18:36:20 +02:00
Regis Houssin
400621135b Fix: indentation 2012-08-05 18:33:11 +02:00
Regis Houssin
25662f9ecc Fix: compatibility with jquery fileupload 2012-08-05 18:32:59 +02:00
Laurent Destailleur
7764cfec83 Trans 2012-08-05 16:43:39 +02:00
Laurent Destailleur
591b029781 Doxygen 2012-08-05 15:15:58 +02:00
Laurent Destailleur
c247c710ec Qual: Uniformize code 2012-08-05 15:00:24 +02:00
Laurent Destailleur
990da41955 Qual: Removed bad herit 2012-08-05 14:56:20 +02:00
Laurent Destailleur
e53e847083 Qual: Uniformize code 2012-08-05 14:37:45 +02:00
Laurent Destailleur
14bda09369 Removed deprecated not used method 2012-08-05 14:11:28 +02:00
Laurent Destailleur
9fef649a7c Removed useless file 2012-08-05 14:06:21 +02:00
Laurent Destailleur
895b491d84 Uniformize files 2012-08-05 14:06:09 +02:00
Laurent Destailleur
0471b4e548 Update doc 2012-08-05 13:30:12 +02:00
Laurent Destailleur
386a1dcb55 More phpunit tests 2012-08-05 13:07:17 +02:00
Regis Houssin
64e32258c2 Merge pull request #291 from marcosgdf/translations
Translations
2012-08-04 22:53:29 -07:00
Laurent Destailleur
22b0261bc7 Update DoliWamp packager 2012-08-05 01:06:37 +02:00
Laurent Destailleur
b82fb7a7d9 Fix: exit code when upgrade is ran from command line 2012-08-05 00:49:28 +02:00