Commit Graph

453 Commits

Author SHA1 Message Date
Laurent Destailleur
2f25e07e5a Add class for body into login page 2013-07-27 11:53:15 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2013-06-14 19:56:07 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3
fix bug : external users should not see costprice and margin infos
2013-05-20 07:39:39 -07:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
2013-05-11 02:12:34 +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
26f3e920cf Fix: Removed warning.
Fix: Missing doxygen
2013-05-02 13:10:39 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql
Conflicts:
	htdocs/core/modules/modSociete.class.php
2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +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
726c83d2d2 Merge pull request #877 from FHenry/develop
Fix bug on Extrafield list table type
2013-04-25 01:23:57 -07:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since
trigger depend on module. Only version of module is required).
2013-04-22 19:59:41 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
Regis Houssin
077698d789 Fix: for avoid missing the customer discount 2013-04-19 12:47:53 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div.
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop
Fixes on invoice payment list and for price by quantity
2013-04-05 13:49:52 -07:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df Fix: Do not loose value dol_use_jmobile when using not connected pages
(support and forget password)
2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff Look: Replace table with div 2013-04-05 17:39:27 +02:00