Commit Graph

3512 Commits

Author SHA1 Message Date
Laurent Destailleur
edab47fbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 18:23:49 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Laurent Destailleur
86a12d7471 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 17:43:43 +02:00
Laurent Destailleur
d8d28d6350 New: Add ChromePHP output into syslog module. 2012-08-29 17:43:20 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Laurent Destailleur
87742cb3d8 Qual: Move an admin tools into admin menu.
Fix: Fix 7 bugs into the mass vat update tool.
2012-08-29 14:13:13 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Laurent Destailleur
9570e03b1e Qual: Add TODO 2012-08-27 12:07:50 +02:00
Laurent Destailleur
d8e162c309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-26 22:36:21 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has
auto-subscribed
2012-08-26 22:33:27 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style
Improved coding style
2012-08-22 22:43:03 -07:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +02:00
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no
supplier price is selected
2012-08-17 16:58:57 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines)
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 16:03:45 +02:00
Laurent Destailleur
2220c6e964 Fix: Do not run request if param is empty 2012-08-08 14:07:04 +02:00
Laurent Destailleur
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation.
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +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
Regis Houssin
4d3e798f99 Fix: remove test in $pictoisfullpath and add test in $options 2012-08-04 14:18:02 +02:00
Regis Houssin
e955b041ca Fix: just change $path value 2012-08-04 09:56:25 +02:00
Regis Houssin
320ce03e29 Fix: optimization
see : http://mkaz.com/web-dev/php-benchmarking-isset-empty-or-var.html
2012-08-04 08:45:38 +02:00
Marcos García
189c3c94da Removed duplicated code 2012-08-04 02:15:39 +02:00
Marcos García
b8add21d93 Reversed lost changes with the previous commit 2012-08-03 23:29:08 +02:00
Regis Houssin
447fc1de1a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 20:10:01 +02:00
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +02:00
Marcos García
d30b2804bc Was using tabs instead of spaces 2012-08-03 14:31:10 +02:00
Marcos García
f700f63494 Little refactor + cpd 2012-08-03 14:30:11 +02:00
Laurent Destailleur
30d22378ac Restore img_phone as deprecated function after a patch push. 2012-08-03 13:10:15 +02:00
Laurent Destailleur
f1618bcaa7 Merge pull request #282 from marcosgdf/style
Refactor
2012-08-03 03:28:10 -07:00
Regis Houssin
fe4fc7f8dc Fix: increase speed 2012-08-02 08:02:49 +02:00