atm-ph
fce8e08b51
Refactoring and fix
2017-03-25 18:13:39 +01:00
atm-ph
ae33e40dc8
Refactoring and add method comments
2017-03-25 17:32:42 +01:00
atm-ph
269645dfc7
Add method documentations
2017-03-25 10:48:06 +01:00
atm-ph
de832d90a9
Refactoring
2017-03-25 00:50:53 +01:00
atm-ph
edc2d39702
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-24 17:06:40 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304
Css enhancement
2017-03-23 21:24:57 +01:00
Laurent Destailleur
eb145faffd
Replace parameter mixte with textselect
2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698
Merge pull request #6552 from defrance/patch-91
...
NEW : introducing "mixte" mode for select_duration
2017-03-23 19:54:33 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
BENKE Charlie
7999cb9a46
introducing "mixte" mode for select_duration
...
If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text,
if 'mixte' input hour is in text and input min is a combo
2017-03-21 23:48:06 +01:00
Laurent Destailleur
acdfd6ab9e
css enhancement
2017-03-21 18:23:58 +01:00
Laurent Destailleur
e7a45a7f6a
NEW Use html5 type "number" on select field for year and duration.
2017-03-21 17:50:43 +01:00
Laurent Destailleur
68257283e4
Enhance select list
2017-03-21 13:39:42 +01:00
Laurent Destailleur
1b0b4c9609
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
b169f93abc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-19 14:27:12 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
b9d6122c53
Add comments
2017-03-18 19:56:53 +01:00
Laurent Destailleur
f7e71d1de2
FIX LOG_ERROR does not exists. Use LOG_ERR.
2017-03-18 11:48:02 +01:00
Laurent Destailleur
597fb11d08
Fix error management in duplicate trigger
2017-03-18 11:36:48 +01:00
Laurent Destailleur
35b79818b7
Uniformize css rules
2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
Laurent Destailleur
6f25d6de24
Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
2017-03-15 12:33:06 +01:00
Laurent Destailleur
4c0ff38020
Fix closing boxes
2017-03-15 11:58:13 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Alexandre SPANGARO
c6c07bf9f4
New : Add project to social contributions
2017-03-12 14:32:49 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe
NEW The substitution keys available for emailing edition is now into a
...
popup
2017-03-11 02:36:22 +01:00
Laurent Destailleur
4737c62394
FIX Avoid flash on screen
2017-03-11 00:52:35 +01:00
Laurent Destailleur
2054ce0aab
FIX Avoid flash on screen
2017-03-11 00:50:55 +01:00
Laurent Destailleur
209bd0b3e4
2nd try to fix better compatibility
2017-03-10 16:53:26 +01:00
Laurent Destailleur
2a3d3b4b50
Fix dol_banner for agenda
2017-03-10 16:40:38 +01:00
Laurent Destailleur
a9b39f3028
Fix dol_banner for agenda
2017-03-10 16:27:28 +01:00
Laurent Destailleur
57c2971175
Fix dol_banner for agenda
2017-03-10 16:19:18 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
de2558c907
Fix useless lines
2017-03-10 12:47:51 +01:00
Laurent Destailleur
50044ed21e
FIX #6499
2017-03-10 12:45:56 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
arnaud
1d31603ad2
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo
2017-03-10 11:46:59 +01:00
Laurent Destailleur
46eedeafe8
Fix message shown to many times
2017-03-10 11:30:46 +01:00
Laurent Destailleur
8389db18bf
Fix solution for comaptibility
2017-03-10 10:07:09 +01:00
Laurent Destailleur
d241adc201
NEW Use autocompletion on the "Add widget list".
2017-03-09 13:22:43 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Laurent Destailleur
8ac1aab45a
Uniformize look and feels
2017-03-07 18:34:57 +01:00
Laurent Destailleur
4e4045d18a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
52a4863ed8
Merge pull request #6480 from dolibarr95/patch-2
...
Add label tag
2017-03-05 21:40:31 +01:00
