Laurent Destailleur
4d7f3cb741
Fixed: Pb of wrapping login page
...
New: Use placeholder
2014-12-08 02:41: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
3186a8c23f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 12:07:53 +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
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +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
e90996b2de
Merge pull request #2121 from frederic34/patch-10
...
Fix missing </div>
2014-12-03 12:21:29 +01:00
Frédéric FRANCE
ddee145c66
Update objectline_view.tpl.php
2014-11-30 20:28:41 +01:00
Frédéric FRANCE
f1fa7e720a
Fix missing </div>
2014-11-30 18:33:00 +01:00
aspangaro
c27e2676e3
Modify presentation of login page
2014-11-29 07:08:35 +01:00
aspangaro
1c89186652
Merge remote-tracking branch 'Upstream/develop' into develop-html5
2014-11-28 06:20:01 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
a81c483061
Revert "Update objectline_create.tpl.php"
...
This reverts commit fdac53bfca
2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d
Fix: W3C a label must be used if there is an "input" field only. Also it
...
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
2014-11-28 02:05:40 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
b98c0a3208
Login - Better presentation with RWD
2014-11-27 20:32:29 +01:00
aspangaro
38d94bac33
Correct login page
2014-11-25 21:47:08 +01:00
aspangaro
559bf93acb
Correct
2014-11-25 20:40:00 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
aspangaro
aa8c165f06
Presentation
2014-11-23 21:03:34 +01:00
BENKE Charles
fdac53bfca
Update objectline_create.tpl.php
...
add label tags for product mode type
2014-11-19 18:53:33 +01:00
Laurent Destailleur
737dfab5b2
Fix: If error on add line of type "product" when creating
...
proposal/order/invoice, do not show date of services.
2014-11-16 19:12:05 +01:00
Laurent Destailleur
7177c04378
Minor css enhancement
2014-11-11 20:45:30 +01:00
Laurent Destailleur
8a89997c79
Fix: bug into edition of extrafields
2014-11-07 22:40:13 +01:00
Laurent Destailleur
3d5a45e274
Fix: textarea too small
2014-11-07 22:19:31 +01:00
Laurent Destailleur
9e92b469b9
Merge pull request #2005 from altairis-fr/hidemargininfos
...
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-07 21:47:06 +01:00
Juanjo Menent
2f30e769f6
Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
2014-11-06 22:16:27 +01:00
Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
80581b2908
Merge pull request #1978 from atm-maxime/3.6
...
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
2014-10-30 17:56:22 +01:00
Maxime Kohlhaas
efd99a6f44
Fix : extrafield errors
2014-10-27 10:20:35 +01:00
MAxime Kohlhaas
374b761fdf
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
2014-10-25 19:20:02 +02:00
Maxime Kohlhaas
ee4b807a5d
Qual : refactoring extrafields display on objects into a single tpl file
2014-10-14 17:00:06 +02:00
Maxime Kohlhaas
452636b0e4
New : Add option to allow extrafield to be modified regardless of the document status
2014-10-14 15:27:40 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Maxime Kohlhaas
4fd67d725a
Fix bug 1588 : relative discount not working anymore
2014-10-09 13:58:43 +02:00
Laurent Destailleur
168b0db094
Fix: button must be align to right
2014-10-08 15:09:07 +02:00
Laurent Destailleur
8bc57e38d1
Uniformize, support, install and login page with a more neutral
...
background (nearest bootstrap). Remove image background.
2014-10-03 01:48:14 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Laurent Destailleur
08d4195504
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767
Missing hook to add button on intervention
...
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
154d1520fb
Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1
2014-08-30 20:36:53 +02:00
Regis Houssin
a446318649
Fix: strict mode anarchy ;-)
...
check your variable please
2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc
Fix: strict mode anarchy ;-)
...
check your variable please
2014-08-27 19:03:01 +02:00
Regis Houssin
76cb6f760a
Fix: strict mode anarchy ;-)
...
check your variable please
2014-08-27 19:02:13 +02:00
Laurent Destailleur
eb3c53d897
Merge pull request #1823 from Devensys/Develop-removeVersion
...
Hidden version on login page
2014-08-21 23:24:08 +02:00
Laurent Destailleur
c79fc516d3
Maj squelette
2014-08-14 17:27:28 +02:00
Andrelec1
1ffb964dd1
Change method
...
Replace by existing constant ..
2014-08-14 16:06:43 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Andrelec1
8b6d613cb0
Hidde version on login page
...
Create option and use it in login template
2014-08-12 12:29:20 +02:00
