Commit Graph

3083 Commits

Author SHA1 Message Date
fhenry
f9328f4018 Propal don't move 2013-05-02 23:00:33 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
Laurent Destailleur
cbc56f8044 Fix: W3C
Fix: Translation
2013-05-01 16:05:52 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Laurent Destailleur
7b85baa5e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
jfefe
54f0d1b1a5 Fix : use standard method to show extrafields 2013-04-27 22:57:29 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
53ca1546d0 Fetch optionnal into fetch of propal 2013-04-26 16:58:04 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
52a1e81147 [ bug #842 ] Erreur SQL Propal 2013-04-23 14:43:32 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock
fix [ bug #842 ] Erreur SQL Propal
2013-04-23 14:02:29 +02:00
fhenry
0513cbe655 Add debug log (dol_syslog) 2013-04-23 11:12:07 +02:00
Regis Houssin
733872e9c9 Fix: merge problem 2013-04-22 14:48:08 +02:00
Regis Houssin
5ccb4108d4 Fix: merge problem 2013-04-22 14:47:37 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
87ce23c4b8 Merge pull request #858 from marcosgdf/fix-notifications-alert-bug
Notifications popup messages were not showing real notifications that we...
2013-04-21 16:08:33 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
Marcos García
5b248805c2 Notifications popup messages were not showing real notifications that were going to be sent 2013-04-21 14:24:19 +02:00
Laurent Destailleur
ab2709f684 Filter on agenda event are autoselected on "manual event". 2013-04-21 12:26:44 +02:00
Laurent Destailleur
01ec3d79ca Reduce default size of description 2013-04-21 11:59:15 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Regis Houssin
17d5ab9774 Fix: no result with a number with a comma
Conflicts:
	htdocs/fourn/facture/index.php

Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
2013-04-19 09:57:13 +02:00
Regis Houssin
45300ccdd8 Fix: no result with a number with a comma 2013-04-19 09:55:22 +02:00
Maxime Kohlhaas
6c62d0cd28 Print forgotten 2013-04-18 10:12:16 +02:00
Maxime Kohlhaas
dcdbdd42fb Fix : action list couldn't be sorted by label, action type was kept in filter 2013-04-18 09:25:19 +02:00
fhenry
cba73b238c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
d3f29649d5 Fix into div/br 2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
simnandez
76132206bf Fix: Bad link to all proposals into Third party card if customer is
prospect
2013-04-15 17:12:31 +02:00
fhenry
acd3d136b5 [ task #798 ] Add range limit date on product/services as it is done on
order and invoice
2013-04-15 15:31:12 +02:00
Marcos García
16afa18e95 Improved and added missing es_ES translations 2013-04-15 00:09:29 +02:00
Laurent Destailleur
22731788c5 Qual: Remove duplicate script. Enhance old one. 2013-04-14 20:15:55 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
9a812b799d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-11 20:02:50 +02:00
Laurent Destailleur
0d79f8e764 Look: Replace table with div 2013-04-11 20:00:12 +02:00
Laurent Destailleur
aeae723108 New: Event into calendar use different colors for different users. 2013-04-11 10:15:53 +02:00
Laurent Destailleur
750b30863f Qual: Clean code from things that should be inside external module. 2013-04-11 09:15:41 +02:00
Laurent Destailleur
f3adcc311d Qual: Removed useless table 2013-04-10 18:34:19 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00