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

4088 Commits

Author SHA1 Message Date
frederic34
8a765bf5fd wip 2015-11-05 16:20:35 +01:00
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos 
Escpos Receipt printer
 2015-11-05 02:18:09 +01:00
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
frederic34
4a67a94704 wip template edit 2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8 sql 2015-11-03 22:12:03 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Alexis Algoud
e3a42a78f2 FIX all PDF hook must be in addreplace type, not return value to work as expected 2015-11-03 15:14:42 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Frédéric FRANCE
7b8a33adfe Update commonobject.class.php 2015-11-02 13:20:51 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense 
reports.
 2015-11-02 13:14:46 +01:00
Laurent Destailleur
269fb87342 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to 
open list of extrafields.
 2015-11-02 11:45:59 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16 
NEW Add supplier order to the Direct Printing System
 2015-11-02 11:27:00 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin 
Fix: #2591 Margin is incorrect used with POS
 2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7 Merge pull request #3802 from olsesacl/develop-hook 
hooks correctly implemented , printObjectLine, printObjectSubLine
 2015-11-02 10:44:59 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list 
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
 2015-10-30 19:23:23 +01:00
Laurent Destailleur
3760f247a2 NEW Can now select fields to show in product list. Extrafields are also 
supported.
 2015-10-30 00:05:00 +01:00
Frédéric FRANCE
b1c4e032fc Update html.formfile.class.php 2015-10-29 19:08:38 +01:00
Florian HENRY
9a95401473 FIX : add tag myuser_job into ODT replacement 2015-10-28 11:27:39 +01:00
fappels
8992cfaeb4 move require_once 2015-10-27 15:50:55 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS 
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
 2015-10-26 20:33:42 +01:00
Sergio Sanchis Climent
990fbf3ef4 hooks correctly implemented , printObjectLine, printObjectSubLine 
In hook can change correctly label and ref (for my module need if is posible)
 2015-10-26 14:00:43 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Laurent Destailleur
71da059ef0 NEW Add a new widget $form->selectArrayAjax() to use combo list with 
content coming from an Ajax URL.
 2015-10-26 11:23:31 +01:00
Laurent Destailleur
77a0359cfc Fix bad test 2015-10-25 20:17:43 +01:00
Laurent Destailleur
9a4b62c279 NEW Introduce use of cache for thumbs images of users 2015-10-25 20:15:52 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
4e206fa80b Fix doxygen 2015-10-25 19:53:59 +01:00
Laurent Destailleur
d7761ece58 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size. 
This make a large download at each page call. We must use the mini
thumbs.
 2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function 
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
 2015-10-25 19:31:42 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
a01a85c3f6 FIX tag object_total_vat_x need x to be a string with unknown decimal 
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
 2015-10-23 15:13:02 +02:00
Laurent Destailleur
8d24adc97e Remove 2 other duplicated pages. There is only one page now for all list 
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
 2015-10-23 13:52:51 +02:00
Laurent Destailleur
531ef43a27 Some minor look fixes. 2015-10-22 19:13:16 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
ce681081c1 Merge pull request #3776 from frederic34/patch-15 
Set warehouse for order
 2015-10-22 12:16:40 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
Laurent Destailleur
7daf9d10af Work on the new selectArrayAjax widget 2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400 Work on the new selectArrayAjax widget 2015-10-21 20:43:11 +02:00
Laurent Destailleur
8306d93286 NEW Add css on column of detail lines to allow module to easily 
manipulate fields.
 2015-10-20 16:08:25 +02:00
Laurent Destailleur
f123e11c8e Doxygen 2015-10-20 12:53:32 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Laurent Destailleur
b5e633ef42 Size too small 2015-10-20 00:52:53 +02:00
Frédéric FRANCE
affe067ff1 Update commonobject.class.php 2015-10-19 21:09:02 +02:00
Laurent Destailleur
d71ccc4a02 NEW The free text in PDF footer can now be a HTML content. So the 
WYSIWYG editor is on by default to edit it into module setup.
 2015-10-19 14:39:55 +02:00
Laurent Destailleur
18725b554b Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented. 2015-10-19 13:23:45 +02:00
Frédéric FRANCE
6f4cfc86e8 Update notify.class.php 
http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
 2015-10-18 11:25:55 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
87c12717a7 NEW The thirdparties tabs, the contacts tabs and the members tabs are 
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
 2015-10-16 20:16:28 +02:00
Laurent Destailleur
df0c6aa5cf Use the new card banner for members 2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Florian HENRY
00b610d87f FIX : fix HTML into formconfirm box 2015-10-14 08:23:52 +02:00
Laurent Destailleur
9f0c0bfc92 NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple 
replacement of translated string on the fly.
 2015-10-13 13:27:44 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
db9d09c7a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 12:28:03 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Laurent Destailleur
525f9841fa Fix doxygen 2015-10-10 18:38:22 +02:00
Laurent Destailleur
f4f7629037 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511 Start to work on a common banner for tabs (goal is to have a nicer and 
generic part for all element)
 2015-10-10 01:51:12 +02:00
Laurent Destailleur
f9485bd25b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2015-10-09 20:35:17 +02:00
Laurent Destailleur
b27989d5d4 Merge pull request #3665 from altatof/fix_extrafields 
reenable search criteria in sql clause
 2015-10-09 20:32:42 +02:00
Laurent Destailleur
f29c03c922 Start to work on a multiselect component to select which fields to show 
into dolibarr lists.
 2015-10-09 16:35:14 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
Florian HENRY
1f2a86078a FIX : Always use type send in parameters in showCategories method 2015-10-08 11:03:08 +02:00
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Raphaël Doursenaud
3fdd59bf0a Fix #3666 checkbox extrafields on edit 2015-10-05 20:39:14 +02:00
Raphaël Doursenaud
41354ca00d Added type hinting to extrafields object 2015-10-05 20:30:55 +02:00
Raphaël Doursenaud
d24f5538f9 Fix: wrong parameters order 2015-10-05 20:25:55 +02:00
Christophe Battarel
bf262c2cae reenable search criteria in sql clause 2015-10-05 15:41:28 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Laurent Destailleur
75e337e8d9 FIX select of project using ajax autocomplete option 2015-10-04 16:02:50 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
fmarcet
a585698b69 FIX: Only are showing one object linked 2015-09-29 08:49:11 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
e1b969cb90 FIX Init into bad var 2015-09-26 16:52:58 +02:00
Laurent Destailleur
a097938ce5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-26 16:52:09 +02:00
Laurent Destailleur
f0d39a6a92 FIX Init into bad var 2015-09-26 16:51:51 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm 
[Qual] Replaced deprecated form_confirm()
 2015-09-26 08:48:16 +02:00
Juanjo Menent
a046bcfc9b Merge pull request #3596 from GPCsolutions/linkedobject 
[Qual] Fixed typo and added hinting
 2015-09-26 08:47:19 +02:00
Juanjo Menent
40425d427d Merge pull request #3593 from GPCsolutions/deprecatedclasses 
[Qual] Constructors of deprecated classes are deprecated
 2015-09-26 08:45:03 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users 
[Qual] Replaced deprecated select_users()
 2015-09-26 08:44:34 +02:00
Juanjo Menent
4f187d3413 Merge pull request #3588 from GPCsolutions/microtime 
[Qual] Replaced deprecated dol_microtime_float()
 2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
57f05e850a [Qual] Fixed typo and added hinting 2015-09-24 20:56:50 +02:00
Raphaël Doursenaud
5f5ef43e04 [Qual] Constructors of deprecated classes are deprecated 
This gives better deprecation hinting.
 2015-09-24 20:35:59 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
65340667b6 [Qual] Replaced deprecated dol_microtime_float() 2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Florian HENRY
206d6d0f7e FIX : avoid SQL error in getValueFrom common object when all params are 
not send
 2015-09-23 13:17:58 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to 
get a default value to use for a form in create mode.
Implement it for public and private notes.
 2015-09-22 13:55:31 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget 
FIX Style of previous-next card when using dolidroid
 2015-09-18 15:51:27 +02:00
Laurent Destailleur
9d7a77f2e5 Doc comment 2015-09-18 12:03:35 +02:00
Laurent Destailleur
4195eb3366 NEW Color category is visible onto the thumb of tags on thirdparty, or 
products cards.
 2015-09-17 20:20:03 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
57521f628c Fix bad path 2015-09-17 19:35:03 +02:00
Laurent Destailleur
b1168d223a NEW Introduce table llx_overwrite_trans to be able to overwrite 
translations by simple database edition.
 2015-09-17 18:44:42 +02:00
Laurent Destailleur
8ff41a8ded Enhance performance of option MAIN_OVERWRITE_TRANS_ 2015-09-17 15:35:51 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
Laurent Destailleur
38bae655ea Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
Laurent Destailleur
1b836dc31e Merge pull request #3408 from aspangaro/develop-60 
New: CkEditor add possibility to choose skin
 2015-09-15 17:09:11 +02:00
aspangaro
5b57231c52 Fix : error skin name by default 2015-09-15 06:14:33 +02:00
aspangaro
2d2f59fe3f Fix : Class 'Categorie' not found in core\class\html.form.class.php 2015-09-14 22:33:48 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
9aec4d554b Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab 2015-09-12 18:21:37 +02:00
Laurent Destailleur
0bfccc7255 Fix print into form to attach file must be into return. 2015-09-12 11:35:56 +02:00
Laurent Destailleur
06d19a5a40 Work on a new widget 2015-09-12 11:33:22 +02:00
Laurent Destailleur
1401debace Fix print into form to attach file must be into return. 2015-09-11 08:32:40 +02:00
aspangaro
0055606256 Invert 2015-09-10 07:36:17 +02:00
aspangaro
3a90bfa6d3 Merge remote-tracking branch 'Upstream/develop' into develop-60 2015-09-10 06:59:23 +02:00
aspangaro
b1b7966c88 ckeditor: define the default skin when constant don't exist. 2015-09-10 06:58:20 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/memory.lib.php
 2015-09-08 10:33:33 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c Fix memcached effect was lost because init was done each time. 2015-09-07 20:17:05 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
a44ab5168c Save memory. 2015-09-07 12:43:25 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
GUERRIER Kevin
692fdbaec4 Adding Document tab into Bank Account 2015-09-04 21:29:16 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
9aa60e1ae1 Fix remove warning 2015-08-31 19:02:14 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
3a32b08512 Fix filter on opportunity status 2015-08-31 15:52:54 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Laurent Destailleur
fb70fbdc06 Merge pull request #3428 from marcosgdf/bug-3426 
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
 2015-08-31 00:53:04 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields 
Close #3426
 2015-08-29 19:42:51 +02:00
Juanjo Menent
25fca6615a Merge pull request #3395 from fmarcet/develop 
NEW: Translate extrafield's labels
 2015-08-28 16:44:49 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
philippe grand
e9f631d2e3 fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" 
This reverts commit 2527ae263b.
 2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Laurent Destailleur
d409568442 Format code 2015-08-20 15:07:16 +02:00
Laurent Destailleur
936f912216 Fix filter on category 2015-08-20 04:07:07 +02:00
fmarcet
d6b84233ed NEW: Translate extrafield's labels 2015-08-18 16:40:03 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
0226f53098 Fix When selecting another email template, the topic was not replaced. 2015-08-13 05:09:26 +02:00
Laurent Destailleur
2c791e528d Revert "unit price not used if qty = 1" 
This reverts commit fb25f479f2.
 2015-08-12 23:15:32 +02:00
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
Regis Houssin
ebe4969723 Fix: missing entity in cache files names 2015-08-11 10:22:06 +02:00
Maxime Kohlhaas
1cbb20c89f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_stats_percent 2015-08-07 13:30:12 +02:00
Maxime Kohlhaas
0afd27e3c2 New : % of evolution on stats 2015-08-07 13:29:11 +02:00
Juanjo Menent
1fdf4b69f8 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 22:14:45 +02:00
Juanjo Menent
eb33624b99 Merge pull request #3291 from GPCsolutions/hookslogging 
NEW: log hooks loading
 2015-08-06 22:11:40 +02:00
BENKE Charlie
83c4652a16 don't display ref_fourn if it's same as ref 
decrease size of the select list
 2015-08-04 15:22:36 +02:00
BENKE Charlie
fb25f479f2 unit price not used if qty = 1 
this line is too long for add unused information
 2015-08-04 13:39:01 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Gauthier
556d01ff8a FIX : Line break display as a block 2015-07-28 15:14:54 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
ad56cb4aa0 Fix upload of files should be possible on mobile device. 2015-07-21 18:27:34 +02:00
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Raphaël Doursenaud
0d897a1307 NEW: log hooks loading 
This will help debugging bad hooks behavior.
 2015-07-20 18:30:49 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
4f5e8e2480 Fix: missing context before calling trigger. 
Clean demo file with list of triggers.
 2015-07-19 15:24:54 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
Laurent Destailleur
21a5a30ade Merge pull request #3175 from All-3kcis/develop-patch-3 
Fix #3158 can't change date in invoices
 2015-07-12 12:21:46 +02:00
Laurent Destailleur
c83cb730fc Merge pull request #3134 from atm-alexis/NEW_add_hook_in_sendmail 
NEW add hook in send mail
 2015-07-11 20:46:01 +02:00
Laurent Destailleur
3eb6ee2030 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-09 12:29:44 +02:00
Laurent Destailleur
c28ff6c257 NEW Add status into filters of graph 2015-07-09 12:29:01 +02:00
All-3kcis
6b54180678 Fix #3158 can't change date in invoices 2015-07-08 16:04:21 +02:00
Regis Houssin
9e7cb70d63 Fix: missing shared parameters 2015-07-08 16:03:15 +02:00
Raphaël Doursenaud
5ebc84e999 [Qual] Reviewed commonobject 
Added missing fields
Removed unused variables
Documented methods parameters
Checked return points
 2015-07-06 17:03:25 +02:00
Florian HENRY
b6850e36c9 fix previous commit 2015-07-06 16:59:03 +02:00
Florian HENRY
8a36353385 FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot 
work because this->db is never instanciated
 2015-07-06 13:18:51 +02:00
Alexis ALGOUD
1277596242 Mode hook 
in $conf->global->MAIN_DISABLE_ALL_MAILS
 2015-07-06 00:51:17 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Laurent Destailleur
3520c94641 Merge pull request #3131 from atm-maxime/check_rejection 
New : Check rejection management
 2015-07-04 04:20:58 +02:00
Laurent Destailleur
5015eb8a88 Merge pull request #3126 from aspangaro/develop-patch48 
Fix travis
 2015-07-04 04:13:32 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier 
Try to continue work on position of menu entries.
 2015-07-02 22:43:51 +02:00
Alexis Algoud
25842b3295 NEW add hook in send mail 2015-07-02 16:03:24 +02:00
Maxime Kohlhaas
84be022ee1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection 
Conflicts:
	htdocs/compta/paiement/cheque/card.php
 2015-07-02 13:45:32 +02:00
aspangaro
39dbec144a Correct travis 2015-07-02 05:15:54 +02:00
Laurent Destailleur
6ef0b8e330 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-01 21:17:05 +02:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
57a267a30f NEW Add hooks to allow an external module to complete list of events 
into calendar views.
 2015-06-30 17:09:52 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
ce6039f7f6 NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
Laurent Destailleur
9d7806f1f4 Tag class as deprecated 2015-06-27 21:26:05 +02:00
Regis Houssin
5efea745a1 Fix: Public method name must not be prefixed with an underscore 2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae Fix: Private member variable must be prefixed with an underscore 2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9 Fix: add private/public function 2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9 Fix: remove unused var 2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308 Fix: change encrypt/decrypt method for avoid division by zero 2015-06-27 19:57:35 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
ceb9955efc Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43 
Conflicts:
	htdocs/contact/list.php
 2015-06-27 02:27:34 +02:00
Maxime Kohlhaas
7486f2228d Debug : date fields were not transmitted by formconfirm 2015-06-26 18:50:57 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Laurent Destailleur
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
Maxime Kohlhaas
17a25ed4a1 Add date option to the formconfirm formquestion 2015-06-26 17:00:24 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Laurent Destailleur
936c46d219 Better error/setup messages. 2015-06-26 13:18:40 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Juanjo Menent
a3b3ce9c77 Merge pull request #3101 from FHenry/3.7 
FIX: multicompny bug with getEntites without shared test
 2015-06-25 20:50:03 +02:00
Florian HENRY
9505d3a528 fix multicompny bug with getEntites without shared test 2015-06-25 17:22:37 +02:00
Raphaël Doursenaud
d6e48670e7 Allow replacing the address block 
Since ba2c0a2651 changed the default hook mode
from addreplace to output, this is needed to still be allowed to replace
the displayed address from a hook
 2015-06-25 11:13:23 +02:00
Fab
3adf6b1a73 Missing space after title tag. 
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.

<td class="classfortooltip" title="title text"valign="top" width="14">

should be :

<td class="classfortooltip" title="title text" valign="top" width="14">
 2015-06-25 08:50:48 +02:00
Laurent Destailleur
02ce0bc6af Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-24 18:32:56 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Laurent Destailleur
4db562c9e7 Tags are shown as thumbs into card. 2015-06-22 22:31:44 +02:00
Laurent Destailleur
bfa0f0d576 Minor look enhancement 2015-06-22 17:20:06 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
Laurent Destailleur
d780c03651 Fix default buttone 2015-06-21 03:47:16 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
Laurent Destailleur
a6a027f5c4 Fix several pb with javascript 2015-06-20 17:24:34 +02:00
Laurent Destailleur
bbce287892 Fix: Pdf merge tool must see only pdf files 2015-06-19 16:05:04 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce 
duplicate code and avoid users to be lost.
 2015-06-19 11:19:13 +02:00
Laurent Destailleur
b5cc7ae1c8 Work on merge tab photos and attached files 2015-06-19 00:52:58 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6 Merge pull request #2412 from marcosgdf/commercial-name 
NEW [ task #851 ] Add a new field: Commercial name
 2015-06-16 11:44:03 +02:00
Laurent Destailleur
417eae9c4f Merge remote-tracking branch 'origin/3.7' into develop 2015-06-16 11:18:51 +02:00
Marcos García de La Fuente
45ebb18367 CodeSniffer corrections 2015-06-16 07:19:31 +02:00
Marcos García de La Fuente
65d3f7968a NEW [ task 1191 ] AJAX selector for projects 2015-06-15 10:04:36 +02:00
Marcos García
adc1998b73 Fixed undefined variable typo 2015-06-15 09:18:58 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/soc.php
 2015-06-13 02:45:42 +02:00
Juanjo Menent
deff75d2ac Merge pull request #3007 from hregis/develop_origin 
Fix: possibility to show icon pdf, dot, doc, etc...
 2015-06-12 21:37:07 +02:00
Laurent Destailleur
1c280a9219 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2015-06-12 16:29:50 +02:00
Laurent Destailleur
1a2bde14fb FIX Better management error into the color conversion functions 2015-06-12 14:37:27 +02:00
Laurent Destailleur
ed0e6753e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-12 13:09:32 +02:00
Laurent Destailleur
3678a12767 NEW Can assign a task to yourself to have it appear on timesheet 2015-06-11 18:27:59 +02:00
Regis Houssin
a51a8aff59 Fix: possibility to show pdf, dot, doc, etc... 2015-06-11 09:12:24 +02:00
Laurent Destailleur
05a653ee5f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-08 18:18:37 +02:00
Laurent Destailleur
b61f7dda0b Merge pull request #2990 from GPCsolutions/dolibarr-2985 
Make default avatar images public to allow Gravatar proxying
 2015-06-08 17:53:37 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying 
Fix #2985
 2015-06-08 17:23:02 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Raphaël Doursenaud
08c9dd358d FIX #2983 Load gravatar avatar images securely over HTTPS 2015-06-08 15:51:41 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product 
Enhance also the prototype test_arrays to include select form before
table.
 2015-06-08 15:07:37 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation 
Fix: navigation in expense report
 2015-06-08 13:49:09 +02:00
Laurent Destailleur
b89473383c Fix phpcs 2015-06-06 16:41:11 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Laurent Destailleur
1652f80300 Memory optimizing. Save 2.3 Mb of memory for all forms that can show 
margin informations. Save 300 Kb of memory for all other pages.
 2015-06-06 15:19:25 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Laurent Destailleur
1880ed701f Uniformize code 2015-06-06 13:22:15 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2 
New: Add object ot the company & Add picture cerfa logo
 2015-06-05 15:58:47 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Laurent Destailleur
fa01dc200d NEW Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key 
enter into the form to send email.
 2015-06-04 12:57:49 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on 
application.
 2015-06-04 11:42:24 +02:00
Laurent Destailleur
8010cb7f33 Fix the extracss parameter was overwritten other css into 
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
 2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome 
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
 2015-06-03 21:01:50 +02:00
Laurent Destailleur
995645800e Fix loading of project 2015-06-03 18:24:09 +02:00
Laurent Destailleur
1411772c81 Fix sql error 2015-06-03 17:07:46 +02:00
aspangaro
3461a8712a New: Add object of the company - Needed for donation 2015-06-03 06:48:15 +02:00
Laurent Destailleur
acd693b513 Fix phpcs 2015-06-01 21:37:09 +02:00
Raphaël Doursenaud
ea798c2315 Qual: deprecate dol_json_encode() and dol_json_decode() 
PHP > 5.3 supports json_encode() and json_decode() natively
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3 NEW Show photo of logged user into login top right block. 
NEW If no photo is available for user, we show a generic photo depending
on gender
 2015-05-30 19:50:07 +02:00
Laurent Destailleur
bfe85cbf37 Better error management 2015-05-30 16:14:54 +02:00
Laurent Destailleur
13b78f9c17 NEW Add gender property managed on user card 
FIX Better error messages when uploading photo of user when permission
to write are not granted
 2015-05-30 02:17:05 +02:00
Laurent Destailleur
888bec2df3 Merge pull request #2904 from fappels/develop 
FIX #2859 HTML units selector
 2015-05-29 17:21:32 +02:00
Laurent Destailleur
0ab3cd03c0 Merge pull request #2896 from GPCsolutions/extrafieldcontacttype 
Allow usage of contact extrafield element type
 2015-05-29 17:18:25 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Alexis Algoud
dd7febe2b9 replace test by getEntity() 2015-05-29 15:10:59 +02:00
Francis Appels
b9c3dec141 Fix: issue #2859 unit form select 2015-05-26 11:14:15 +02:00
Laurent Destailleur
c8949d0532 Some doxygen fixes 2015-05-25 18:43:46 +02:00
Raphaël Doursenaud
ec2035a73e Allow usage of contact extrafield element type 
As documented in the methods comments
 2015-05-25 17:19:27 +02:00
phf
33ad86261a FIX : width multiselect 2015-05-25 16:42:51 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
Juanjo Menent
55b7dab292 Merge pull request #2884 from GPCsolutions/categories-types 
Added types constants to categories
 2015-05-23 19:09:07 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Raphaël Doursenaud
139b41c014 Make select_salesrepresentative() return 0 when empty 
Fix #2881
 2015-05-23 16:38:59 +02:00
Alexis Algoud
91885c9d6f FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) 2015-05-22 17:22:57 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Laurent Destailleur
a09563435b Merge pull request #2840 from FHenry/develop 
NEW : add date value filter on account records list
 2015-05-21 21:22:31 +02:00
Laurent Destailleur
e075fce5eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae Enhance style 2015-05-21 01:32:56 +02:00
Florian HENRY
8fa3b8dac3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-20 11:24:49 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Florian HENRY
23eac58cc8 fix bug on new feature checkbox list form table 2015-05-18 13:13:50 +02:00
Marcos García de La Fuente
e2b2c1c8bd Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7 Merge remote-tracking branch 'upstream/develop' into commercial-name 2015-05-15 11:17:21 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
Laurent Destailleur
33b9d492e2 Clean code 2015-05-14 15:43:07 +02:00
Laurent Destailleur
ce0d728438 Merge pull request #2813 from bafbes/patch-3 
Update html.formfile.class.php
 2015-05-12 23:02:45 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes 
jQuery fixes
 2015-05-12 22:36:12 +02:00
Raphaël Doursenaud
9b56427858 [Qual] Fixed HTML multiple attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The multiple attribute is boolean.
 2015-05-12 15:11:47 +02:00
Raphaël Doursenaud
ce60ae0fcc [Qual] Fixed HTML readonly attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
 2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
d5565fffc1 [Qual] Fixed HTML input form disabled attribute 2015-05-12 15:01:13 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
Bahfir Abbes
142460ab16 Update html.formfile.class.php 
Fix forgotten last contributor information
 2015-05-12 08:53:09 +01:00
Bahfir Abbes
3e4fcd1ac7 Update html.formfile.class.php 
in order to correct document lists in list of supplier invoices
 2015-05-11 17:51:54 +01:00
Laurent Destailleur
5bac040a9a Enhance prototype for select 2015-05-10 21:21:29 +02:00
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Laurent Destailleur
cc5968fbd5 A more complete error message 2015-05-07 10:45:35 +02:00
Laurent Destailleur
4ce4529cd5 Revert "Remove useless variables for common object" 
This reverts commit 82682dfc66.
 2015-05-05 22:09:58 +02:00
Juanjo Menent
dc01de8072 Merge pull request #2765 from aternatik/common_properties 
Remove useless variables for common object
 2015-05-05 20:27:52 +02:00
Laurent Destailleur
1e8b148e4b Work on tracking id into emails 2015-05-05 04:10:42 +02:00
jfefe
82682dfc66 Remove useless variables for common object 
Fields name / civility / ... are nonsense for a lot of objects into Dolibarr.
They could be defined for each object instead of into the common object class.
This for the API which exposes a property civility for a category :\
 2015-05-05 01:13:49 +02:00
Laurent Destailleur
c89c89c73e Mutualise code and some fixes for stock management. 2015-05-04 22:02:54 +02:00
Laurent Destailleur
877511717b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-03 21:35:09 +02:00
Laurent Destailleur
0ba2ae6d32 Some fix in css 2015-05-03 21:31:09 +02:00
Laurent Destailleur
8a7728f193 Merge pull request #2752 from fappels/develop-tcpdfbarcode 
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
 2015-05-03 21:19:01 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we 
take first entry found.
 2015-05-03 20:07:16 +02:00
Laurent Destailleur
f0b10c14d7 NEW Add a new component to select categories/tags from the main edit 
page of product. The dedicated tab is also removed.
 2015-05-03 15:51:55 +02:00
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
 2015-05-03 13:00:39 +02:00
Francis Appels
cb75d0778a Fix doc errors 2015-05-03 11:09:33 +02:00
Francis Appels
2fd4bf1012 Add commonstickergenerator class 
Common abstract class for sticker printing.
Creates contracts for write_file and addSticker methods
 2015-05-03 09:54:37 +02:00
aspangaro
6dfd125872 Spaces 4 : Stop Shouting ! 2015-05-03 06:25:50 +02:00
aspangaro
7062dc7b2e Spaces 3 : the darkside 2015-05-03 06:20:34 +02:00
aspangaro
3a5f6db571 Spaces 2 : return of the vilains 2015-05-03 06:18:21 +02:00
aspangaro
9aa336e0d0 Spaces !!! 2015-05-03 06:16:28 +02:00
aspangaro
8163563753 New: Add option to show long or short (by default) label in select_month() 2015-05-03 06:12:02 +02:00
Francis Appels
f762d6d7cb Add tcpdfbarcode 
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
 2015-04-30 16:41:52 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
1e237defb0 Fix phpcs 2015-04-26 17:59:02 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
7c706ebaf6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-25 23:15:55 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
5a509940f3 Merge pull request #2706 from GPCsolutions/mobiledetect 
Mobiledetect
 2015-04-24 21:22:56 +02:00
Laurent Destailleur
a091158cce Merge pull request #2690 from open-minds/develop 
Add sorting for extra fields values
 2015-04-24 21:10:27 +02:00
Raphaël Doursenaud
7281ea21e6 Qual: moved mobiledetect external library 
External libraries resides in the include directory
 2015-04-23 20:30:33 +02:00
Laurent Destailleur
7fd2247297 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-23 13:45:02 +02:00
Laurent Destailleur
f9285d6d23 NEW Can add all user of a project as user of a task, in one step. 2015-04-23 13:44:45 +02:00
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Léonard
e0cc007487 Add sorting for extra fields values 2015-04-21 20:21:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Laurent Destailleur
1c8e1638c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060 Fix js warnings, select2 css was not loaded. 2015-04-21 12:08:36 +02:00
Laurent Destailleur
9d1c609c4f Merge pull request #2538 from marcosgdf/units 
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-04-21 11:14:50 +02:00
jfefe
f2d05ce754 Add missing value for object line type (product or service) 2015-04-20 16:20:04 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
Raphaël Doursenaud
e7a21de11d Use minified select2 js lib 2015-04-19 12:58:47 +02:00
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
 2015-04-19 00:48:07 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Maxime Kohlhaas
51522decf3 Fix : price in editkeyval function was forcing a price rounding 2015-04-18 18:33:46 +02:00
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Florian HENRY
6391fd0c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Laurent Destailleur
deb62f1ffd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
 2015-04-18 04:18:59 +02:00
Laurent Destailleur
aab9b0ec60 Merge pull request #2620 from atm-maxime/develop_cat_multiselect 
New : categories as multi-select on product
 2015-04-18 03:53:05 +02:00
Maxime Kohlhaas
9d8036e5a7 New : categories as multi-select on product 2015-04-18 03:12:42 +02:00
Laurent Destailleur
8511f1f7ef Fix the data-role parameter 2015-04-15 18:14:26 +02:00
Maxime Kohlhaas
4d119065a8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-14 13:01:41 +02:00
Laurent Destailleur
75b3fd442e Add option to allow to filter list on project creation 2015-04-14 12:32:19 +02:00
Laurent Destailleur
97cdc55839 NEW Module notification should details of emails into confirm box, not 
only number.
 2015-04-13 17:04:18 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
f6c2472d92 fix var not declared 2015-04-08 21:50:17 +02:00
Laurent Destailleur
c4daca2bac Fix #1682 2015-04-08 21:34:04 +02:00
Laurent Destailleur
ca7a7a9038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
 2015-04-08 20:43:51 +02:00
Frédéric FRANCE
85d8d06ca4 Travis fix CMailFile.class.php 2015-04-06 20:02:29 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
0155d75f27 Merge pull request #2554 from aspangaro/develop-adherent 
Module member: move field note to note_private & typo
 2015-04-06 12:58:52 +02:00
Laurent Destailleur
e2508287bd Merge pull request #2537 from marcosgdf/cq 
Created Propal, FactureFourniseur, and Commande constants for status
 2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
Laurent Destailleur
a5c74a7d95 Clean code 2015-04-06 11:59:58 +02:00
aspangaro
03b1db138e Debug 2015-04-06 08:20:23 +02:00
Laurent Destailleur
5fa21f37f0 Fix trim label 2015-04-05 17:13:24 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
b01369a32e Error management 2015-04-03 15:25:24 +02:00
Marcos García de La Fuente
6fe803cd86 Created Propal, FactureFourniseur, and Commande constants for status 2015-04-03 05:18:47 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
1bc0f6c99f Fix: do not show end date when it is same than start date 2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Laurent Destailleur
86603b01dd Merge pull request #2504 from marcosgdf/constants 
Implemented constants for some object types and statuses
 2015-03-30 09:25:18 +02:00
Marcos García de La Fuente
8b8171c700 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/card.php
 2015-03-30 03:25:57 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into 
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
 2015-03-30 02:56:26 +02:00
Laurent Destailleur
fd8d09c8c0 Fix avoid warning 2015-03-29 17:53:05 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
Laurent Destailleur
21b1f7cc26 Fix bad calculation of email for notifications 2015-03-25 14:51:12 +01:00
fmarcet
456b11d148 Fix: Not using where on sellist 2015-03-25 11:23:05 +01:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. 
Avoid logo to overwrap box with css.
Add help text.
 2015-03-24 14:08:56 +01:00
Marcos García de La Fuente
3d50b41b8e Reverted $rowid instead of $id property 2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
87faf530e0 Merge pull request #2468 from defrance69/patch-55 
Update extrafields.class.php
 2015-03-22 21:28:53 +01:00
Laurent Destailleur
abcebd7875 Merge pull request #2462 from defrance69/patch-54 
Update extrafields.class.php
 2015-03-22 21:27:38 +01:00
BENKE Charles
730593b525 Update extrafields.class.php 
if no elementtype send at the function, they return an empty array
 2015-03-22 20:26:20 +01:00
Laurent Destailleur
49824a0e56 Method colorStringToArray can accept the # 
Method monthArray can return short label of month
 2015-03-22 18:17:25 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
55140afde4 Merge branch 'price-global-variables' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/dynamic_price/editor.php
 2015-03-22 12:45:04 +01:00
Laurent Destailleur
3a9c195f10 Fix hook management match spec 2015-03-20 00:34:55 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Laurent Destailleur
ba526c5a2f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-18 14:32:58 +01:00
Laurent Destailleur
2c61717e10 Fix sql syntax error 2015-03-18 14:19:17 +01:00
BENKE Charles
d5afa1b29f Update extrafields.class.php 
Link object : include only if something to display
 2015-03-18 13:23:14 +01:00
Laurent Destailleur
7ef11b2f38 Fix selected attribute not set correctly 2015-03-18 13:16:59 +01:00
Laurent Destailleur
84bea6166e Doxygen 2015-03-17 10:55:45 +01:00
Laurent Destailleur
4fffeb3a89 Clean code 2015-03-17 10:52:27 +01:00
Laurent Destailleur
689d270552 Doxygen 2015-03-17 10:47:20 +01:00
Laurent Destailleur
bfd979224f Var not declared 2015-03-17 10:38:25 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
6ba3b900b7 PHPCS Fix 2015-03-15 23:42:11 +01:00
Marcos García de La Fuente
b822a1e3ad Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-15 18:20:17 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Ion Agorria
5f9b1fa029 Changes for applying new paths 2015-03-14 16:50:02 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
BENKE Charles
0aa2360691 Update extrafields.class.php 
add new extrafields type 'link'
 2015-03-14 12:31:22 +01:00
BENKE Charles
df9f822a70 Update commonobject.class.php 
new extafields type
 2015-03-14 12:25:17 +01:00
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show() 
and this method can be override.
 2015-03-13 21:45:52 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
Maxime Kohlhaas
60022ab80d NEW : autofocus on product selection dropdown list or search field 2015-03-12 17:25:57 +01:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
e2e95b5f8c phpcs 2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
e8732df747 Merge pull request #2441 from aspangaro/develop-ReviewER 
FIXED: Review Expense Report
 2015-03-11 02:14:13 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
Laurent Destailleur
b4a8f19696 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442 Fix sql syntax 2015-03-10 18:33:14 +01:00
Laurent Destailleur
209f8946d0 All files must be lowercase 2015-03-10 14:17:58 +01:00
Laurent Destailleur
94acbeaa22 Prepare perms on extrafields 2015-03-09 21:40:24 +01:00
aspangaro
69dc3cdd61 Correct fk_statut & work en list 2015-03-08 08:21:49 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status 
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
 2015-03-08 02:08:26 +01:00
Laurent Destailleur
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +01:00
Florian HENRY
0d801be6a1 NEW: (Dev) DolGraph allow extended class to override $_stringtoshow 2015-03-06 06:12:47 +01:00
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 02:10:01 +00:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
40adbe5a72 Merge pull request #2420 from aspangaro/develop-patch17 
NEW: [T1848] Merge bank card & account card
 2015-03-04 21:09:28 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57 Removed $permtoedit variable 2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
54b6b199c7 Documented missing properties and removed redundant documentation 
(cherry picked from commit 6124f6a)
 2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9 Moved duplicated code to common class 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
f82df1e634 Refactorred supplier order to match with objectline templates 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
174f1cb5f7 Refactored supplier invoice line view to fit commonobjectline view 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b0e728251a Every line has a $rowid property 2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
ad72425291 Moved some variables from FactureLigne to CommonInvoiceLine 2015-03-04 10:37:43 +01:00
Laurent Destailleur
4c1d51bd39 phpcs 2015-03-04 02:28:16 +01:00
Laurent Destailleur
6f96d4cd5c Minimum style 2015-03-04 02:18:20 +01:00
Laurent Destailleur
fddbca50b1 Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of 
tracking id into email.
 2015-03-03 18:33:53 +01:00
aspangaro
fafebf5b2a NEW: [T1758] Merge bank card & account card 2015-03-02 22:44:11 +01:00
Florian HENRY
d80a8bbdba revert bug1840 to eldy solution 2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/contrat/card.php
 2015-03-02 10:02:54 +01:00
Laurent Destailleur
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
 2015-03-02 03:07:19 +01:00
Laurent Destailleur
ce8cbee5d2 Merge pull request #2399 from marcosgdf/misc 
misc
 2015-03-02 00:31:27 +01:00
Laurent Destailleur
7fc0c2b485 Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements 
New add doc on project linked elements
 2015-03-02 00:19:21 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +01:00
Laurent Destailleur
4d226885cb Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 18:10:31 +01:00
Marcos García de La Fuente
2ba795fcbc NEW: [ task #851 ] Add a new field: Commercial name 2015-02-28 14:30:06 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Laurent Destailleur
828716420b Comment of function was not correct 2015-02-26 16:19:45 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Marcos García de La Fuente
fb959abc63 Misc PHPdoc fixes 2015-02-25 18:24:36 +01:00
Alexis Algoud
b4f3068141 NEW add PDF icon on linked element into project 2015-02-24 18:20:19 +01:00
Laurent Destailleur
562348eb34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1 Fix missing fields into import of thirdparties. 
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
 2015-02-24 15:40:50 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
phf
11a0624e39 [CORE] FIX Travis phpcs (#incoterm). 2015-02-23 11:19:00 +01:00
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
phf
c459794999 [CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm). 2015-02-23 10:36:44 +01:00
Laurent Destailleur
b04682db4c Fix Edit of extrafield on supplier invoice or order was deleteing other 
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
 2015-02-22 17:41:02 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Laurent Destailleur
41196c01e9 Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not 
accepting all html tags from templates.
 2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
d46c76311c Correction 2015-02-20 10:23:17 +01:00
Florian HENRY
4ba2a1344e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-19 10:15:57 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
316e5c2f19 Merge pull request #2358 from marcosgdf/board-refactor 
Refactored dashboard indicator
 2015-02-18 23:39:15 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
1e1543403b New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set 
user approving as contact following supplier order.
 2015-02-17 19:49:17 +01:00
Marcos García de La Fuente
fa55c60c35 Renamed WorkBoardResponse to WorkboardResponse 2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
c01281a538 Renamed WorkBoardResponse::$late_url to WorkBoardResponse::$url_late 2015-02-16 23:45:52 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
 2015-02-16 20:59:04 +01:00
Laurent Destailleur
213c818204 Debug serial/lot management 2015-02-16 20:14:16 +01:00
Laurent Destailleur
3cf4b80baa Fix missing test of action when using canvas 2015-02-16 02:02:11 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
Laurent Destailleur
eef1e17c61 Fix: default vat 2015-02-15 19:38:20 +01:00
Marcos García de La Fuente
2c074a94f3 Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error 2015-02-15 15:57:38 +01:00
Marcos García de La Fuente
d5fd20e911 Renamed BoardResponse to WorkBoardResponse 2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Florian HENRY
e9bfa71556 syntax 2015-02-11 11:49:06 +01:00
Florian HENRY
db2dee7c03 syntax 2015-02-11 11:48:11 +01:00
Florian HENRY
db94860f76 syntax 2015-02-11 11:47:12 +01:00
Florian HENRY
73f1d10b72 syntax 2015-02-11 11:46:29 +01:00
Florian HENRY
7f5e4aa135 FIX : bug #1840 Email template modules in HTML are not render correctly 2015-02-11 11:44:49 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Marcos García de La Fuente
530186c59d PHPDoc and misc fixes for several folders 2015-02-10 13:32:00 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
phf
2a1a5e74c6 [CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm). 2015-02-10 11:46:09 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
ca939bf8a5 PHPDoc and misc fixes for several folders 2015-02-10 11:02:11 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
phf
1701ecfd89 [CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm). 2015-02-10 10:23:38 +01:00
phf
23751c75dc [CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm). 2015-02-10 10:22:38 +01:00
phf
62762f82a9 [CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm 2015-02-09 17:55:43 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
90fdc29d5e Fix restore compatibility 2015-02-07 17:41:20 +01:00
Laurent Destailleur
a21acdeb7c Enable select2 for users combo 2015-02-07 03:41:09 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
35129f2192 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly 
supported.
Fix: No limit on ldap search on dolibarr side.
 2015-02-06 16:33:33 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
phf
c22bbb23d8 [CORE] ré-indentation d'une ligne (#new_ask_price). 2015-02-03 10:09:25 +01:00
Laurent Destailleur
7b209fa0be New: Add hidden option PDF_SHOW_PROJECT to show project ref onto 
supplier orders and invoices.
 2015-02-02 18:36:49 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
Laurent Destailleur
34cbcad9da Reduce number of new to save memory usage. 
Fight table to replace with div
 2015-02-01 00:40:42 +01:00
Laurent Destailleur
9188be57ce Select2 component creates problem of sizing with jmobile. 2015-01-31 19:25:26 +01:00
Laurent Destailleur
d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
 2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01:00
phf
5da4d0262e [CORE] ajouts des conditions nécessaire pour l'intégration du module (#new_ask_price). 2015-01-28 17:28:44 +01:00
phf
a9d26efee8 [CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price). 2015-01-28 14:44:48 +01:00
phf
ec621244f3 [CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price). 2015-01-28 14:34:27 +01:00
phf
49fa0056c8 [CORE] Avancement des replace (#new_ask_price). 2015-01-27 17:43:07 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
frederic34
12c8d4ba1f Merge remote branch 'upstream/develop' into tooltip 2015-01-22 00:44:50 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Frédéric FRANCE
3ab6ac601e Type of supplier invoice was broken 2015-01-20 17:55:20 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes 
misc-fixes
 2015-01-19 15:28:28 +01:00
Florian HENRY
ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php
 2015-01-19 09:38:00 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100 Corrected weird typo 2015-01-18 16:28:42 +01:00
Florian HENRY
b171975d18 Fix travis 2015-01-18 16:08:10 +01:00
Florian HENRY
22c253cfc1 add extrafield type, check box from table 2015-01-18 16:02:31 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1783

Conflicts:
	ChangeLog
 2015-01-18 15:10:30 +01:00
Laurent Destailleur
3db231cea6 Merge pull request #2232 from defrance69/patch-43 
Update commondocgenerator.class.php
 2015-01-18 13:45:50 +01:00
Laurent Destailleur
34fe87536b Merge pull request #2137 from frederic34/printipp 
Printing System which may accept modules
 2015-01-18 13:09:41 +01:00
Frédéric FRANCE
f3a3136452 Update html.form.class.php 2015-01-18 11:38:45 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
BENKE Charles
e07bb07bab Update commondocgenerator.class.php 
add extrafield on odt lines
 2015-01-12 18:18:43 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
ce1cad2801 Merge pull request #2207 from frederic34/patch-3 
Enhance select_categories with select2
 2015-01-06 00:17:43 +01:00
Laurent Destailleur
6916fffbe2 Merge pull request #2197 from frederic34/patch-5 
Attribut width not allowed with div or span
 2015-01-06 00:08:08 +01:00
philippe grand
96e6c66365 better translation and typo 2015-01-01 11:24:00 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Frédéric FRANCE
56dd276504 Enhance search_categories with select2 2014-12-28 15:17:54 +01:00
frederic34
e937039596 Merge remote branch 'upstream/develop' into printipp 2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44 Added expressions for product/service prices 2014-12-28 01:26:41 +01:00
Frédéric FRANCE
dc18759c6c Attribut width not allowed with div or span 2014-12-27 11:15:26 +01:00
Laurent Destailleur
5d80061caf Mark property error as deprecated 2014-12-26 22:04:16 +01:00
Laurent Destailleur
d8557d8af0 Fixed: label 2014-12-26 05:16:00 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
3c500158a9 Merge pull request #2187 from marcosgdf/bug-1715 
Fix [ bug #1715 ] Valign and width attributes are used in div tags
 2014-12-26 04:02:46 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
54437703fb Merge pull request #2177 from frederic34/patch-7 
Enhance select_salesrepresentatives with select2
 2014-12-26 03:49:43 +01:00
Marcos García de La Fuente
2616deb58d Copyright info 2014-12-25 22:52:11 +01:00
Marcos García de La Fuente
eb524cfd29 Copyright info 2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd Fix: [ bug #1715 ] Valign and width attributes are used in div tags 2014-12-25 22:50:15 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
bd7f6339ce Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-25 12:08:35 +01:00
Marcos García de La Fuente
1179f722af Merge branch '3.7' into bug-1533 2014-12-25 01:26:00 +01:00
Frédéric FRANCE
d03cc03cd7 Enhance select_salesrepresentatives with select2 2014-12-23 16:42:05 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
8a14409974 Fix: [ bug #1533 ] Links triggers do not show trigger error message 2014-12-23 11:39:43 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
frederic34
3bf63ed0a9 Merge remote branch 'upstream/develop' into printipp 2014-12-21 14:59:37 +01:00