Commit Graph

9302 Commits

Author SHA1 Message Date
Laurent Destailleur
a0112ba724 Better position of elements 2014-12-11 21:38:53 +01:00
Laurent Destailleur
c994fbe44d Fixed: Bad style 2014-12-11 14:31:47 +01:00
Laurent Destailleur
67cf3cb99b Fixed: BIC/SWIFT and IBAN must be at same level 2014-12-11 10:13:44 +01:00
Laurent Destailleur
b7c476d339 Merge pull request #2139 from frederic34/patch-3
Use same size for select_produits_fournisseur and select_produits
2014-12-10 11:30:57 +01:00
Laurent Destailleur
7834a9b099 Add hidden constant to solve bug of too low size to see products label. 2014-12-10 00:51:57 +01:00
frederic34
608f4a7d7d Some correct html 2014-12-09 23:37:04 +01:00
Frédéric FRANCE
9f1ec0e710 Update html.form.class.php 2014-12-09 20:52:55 +01:00
Frédéric FRANCE
66f634f217 Update functions.lib.php 2014-12-09 20:47:54 +01:00
Frédéric FRANCE
6a01b6982e Update html.form.class.php 2014-12-09 20:20:52 +01:00
Frédéric FRANCE
590618eb38 Update functions.lib.php 2014-12-09 20:17:13 +01:00
Frédéric FRANCE
34b42ba798 Truncate label different for small or big screen 2014-12-09 18:47:12 +01:00
Frédéric FRANCE
8cae2f1448 Use same size for select_produits_fournisseur and select_produits 2014-12-09 16:21:44 +01:00
Laurent Destailleur
6a70af2b67 Fixed: bug into produc batch management 2014-12-09 14:03:10 +01:00
aspangaro
81dc1415de Untranslatable token in activity box 2014-12-09 05:04:39 +01:00
aspangaro
666e66e78f Correct link in activity box 2014-12-09 05:04:12 +01:00
frederic34
6b4d7b973b Some changes 2014-12-08 23:30:17 +01:00
frederic34
16d860b3f7 Lang Correction 2014-12-08 22:17:28 +01:00
frederic34
715d0f18db Lang correction 2014-12-08 21:52:53 +01:00
frederic34
9bb1999dc2 Some correct 2014-12-08 21:07:24 +01:00
frederic34
295fe115ab Merge remote branch 'upstream/develop' into printipp 2014-12-08 20:33:50 +01:00
frederic34
be60c13de6 WIP Printing System 2014-12-08 20:33:26 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
4d7f3cb741 Fixed: Pb of wrapping login page
New: Use placeholder
2014-12-08 02:41:21 +01:00
Laurent Destailleur
ef73201b3e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-08 00:11:21 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
c3734b1a88 Merge pull request #2103 from grandoc/develop
add default payment mode select
2014-12-08 00:03:05 +01:00
Laurent Destailleur
6ddae270b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 23:52:02 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2014-12-07 19:19:48 +01:00
Laurent Destailleur
c35018be5f Fixed: Translations 2014-12-07 18:24:45 +01:00
Laurent Destailleur
0b766b1f47 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-07 12:11:26 +01:00
Laurent Destailleur
ff23b0c0a6 Fix: No print 2014-12-07 12:10:50 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Juanjo Menent
fe23a851e7 Fix: datepicker first day of week can be monday by setting into
display setup
2014-12-06 11:03:48 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into
display setup
2014-12-06 11:00:49 +01:00
Florian HENRY
aaf2cca45f Fix bug n sellist extrafield filtered 2014-12-05 21:25:43 +01:00
Laurent Destailleur
df066c3741 Fix: PHPCS 2014-12-05 20:34:36 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
2014-12-05 20:21:40 +01:00
Laurent Destailleur
5f353c39d1 Fix: PHPCS 2014-12-05 20:18:30 +01:00
Laurent Destailleur
efe2719f48 Fix: PHPCS 2014-12-05 20:12:32 +01:00
frederic34
5cce8c45e3 WIP PrintIPP 2014-12-05 18:23:54 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch.
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
2014-12-04 15:29:45 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
for release.
2014-12-04 13:20:56 +01:00