Laurent Destailleur
e38ad37ce3
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
...
implemented
2017-03-26 05:02:06 +02:00
atm-ph
09f645fc9f
Fix travis
2017-03-25 23:21:49 +01:00
atm-ph
76b95aeec0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-25 19:15:25 +01:00
atm-ph
2fc74b4962
Refactoring class
2017-03-25 18:53:14 +01:00
atm-ph
cb576e6c99
Refactoring class
2017-03-25 18:26:10 +01:00
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
Laurent Destailleur
292bcae592
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-25 00:05:04 +01:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +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
florian HENRY
fc63008485
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect
2017-03-06 15:35:29 +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
Laurent Destailleur
5fa6592d6e
Fix bad conf used
2017-03-04 20:10:50 +01:00
Laurent Destailleur
379e0083ab
Fix bad help
2017-03-03 18:00:53 +01:00
Laurent Destailleur
6c91cb4f90
Fix it was not possible to create/edit a new chart of account
2017-03-03 17:59:49 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
85518c6a54
FIX #6479
2017-03-03 14:04:40 +01:00
Laurent Destailleur
07c828d38f
Introduce method loadLangs to save code lines
2017-03-03 13:27:51 +01:00
arnaud
cff9fa0e6b
FIX user odt
2017-03-03 12:01:58 +01:00
arnaud
abeba95de9
New USER odt
2017-03-02 15:13:42 +01:00
dolibarr95
d3a80795ce
Add label tag
...
Add a label html tag for the input radio extrafield tag.
2017-03-02 11:40:43 +01:00
Laurent Destailleur
d202003e29
Fix translation
2017-03-01 18:12:06 +01:00
Laurent Destailleur
8487f0fc96
Fix missing setup of new option
2017-03-01 11:18:11 +01:00
Laurent Destailleur
3c54cb5ba9
Fix avoid trigger during migration
2017-02-28 20:55:14 +01:00
Laurent Destailleur
9648f20a2e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-28 12:08:41 +01:00
Laurent Destailleur
59d2943d8d
Fix context must be provided to triggers using ->context no a dedicated
...
property.
2017-02-28 12:07:05 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
74e8fb9c19
NEW Can set number of dump to keep with job "local database backup"
2017-02-27 02:04:25 +01:00
Laurent Destailleur
43f3e46aac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-27 01:23:48 +01:00
Laurent Destailleur
4f24613de0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8
Fix parameters
2017-02-27 00:22:11 +01:00
Ion
320da17c78
Add object extrafields to mail form
2017-02-26 03:42:42 +01:00
Laurent Destailleur
1ef899dacc
Prepare database to follow supplier discounts
2017-02-24 15:22:32 +01:00
Laurent Destailleur
baa1f3ed2b
Clean doc about changes in external libraries
2017-02-24 14:35:20 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
Laurent Destailleur
24c2675705
Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
...
NEW : Can send email to multiple destinaries from mail form
2017-02-22 14:39:35 +01:00
Laurent Destailleur
ba03b17354
Fix css
2017-02-22 14:30:39 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
cbe855370b
Merge pull request #6451 from laudeco/feature/list_user_by_firstname
...
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-22 14:17:00 +01:00
Laurent Destailleur
3f3b82ed64
Merge pull request #6454 from atm-florian/dev_fix_unittrad
...
fix unit trad
2017-02-22 14:16:28 +01:00
Laurent Destailleur
1681445427
Remove useless line
2017-02-22 00:08:25 +01:00
florian HENRY
c8de648924
fix unit trad
2017-02-21 19:07:57 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
De Coninck Laurent
33d1d78329
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-21 09:22:50 +01:00
Alexis ALGOUD
4a97864d23
change for tms
2017-02-20 15:54:02 +01:00
Alexis ALGOUD
07d6bbf835
change for tms
2017-02-20 15:53:43 +01:00
Laurent Destailleur
a8129ce46e
Fix transaction/sql error
2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa
Fix the accounting account groups must be editable by book keeper, not
...
admin user.
2017-02-20 11:21:38 +01:00
Laurent Destailleur
2dbae7b808
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
Laurent Destailleur
1f156c1716
Merge pull request #6436 from defrance/patch-79
...
on list, preview tooltip is not displayed correctly
2017-02-17 13:27:31 +01:00
florian HENRY
f7e1927b43
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect
2017-02-17 13:25:19 +01:00
florian HENRY
4836fa8f76
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email
2017-02-17 13:24:06 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
a91d57037e
FIX #6433
2017-02-17 13:09:28 +01:00
BENKE Charlie
b94312162e
on list, preview tooltip is not displayed correctly
...
it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
2017-02-17 12:05:24 +01:00
Laurent Destailleur
afa5ef2913
NEW Introduce fields that can be computed during export in export
...
profiles.
2017-02-17 00:19:28 +01:00
florian HENRY
a98e5b7290
fix syntax
2017-02-15 11:46:36 +01:00
florian HENRY
5ec01b3175
NEW : Can send email to multiple destinaries from mailform
2017-02-15 11:41:09 +01:00
florian HENRY
a26081d352
Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect
2017-02-15 09:10:49 +01:00
Laurent Destailleur
eb70d6eea1
Debug of feature for browser notifications
2017-02-14 18:20:01 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Laurent Destailleur
ad361d6d45
Merge pull request #6394 from aspangaro/6.0-fiscalyear
...
[FP17] Accountancy - Prepare fiscal year
2017-02-08 19:25:02 +01:00
Laurent Destailleur
596c092ec8
Merge pull request #6219 from atm-florian/dev_changelistchild
...
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
2017-02-08 16:49:18 +01:00
Laurent Destailleur
d5b10a18b7
Debug module variant
2017-02-08 12:52:31 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Alexandre SPANGARO
4126dcff03
[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.
2017-02-08 06:51:42 +01:00
Laurent Destailleur
fcbc12ce31
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
...
New link movement stock to project
2017-02-06 20:45:04 +01:00
Laurent Destailleur
d230883638
Merge pull request #6367 from gnovaro/patch-2
...
Code style
2017-02-06 20:25:16 +01:00
Laurent Destailleur
a673afe601
NEW Description of feature of a module into a dedicated popup
2017-02-04 14:16:17 +01:00
BENKE Charlie
3f236b1ebf
FIX : $resaction not used in all case
...
Please integrate on next 5.0
2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f
Merge pull request #6211 from GPCsolutions/optimizetranslate
...
[Qual] Optimize language file loading
2017-02-03 11:55:29 +01:00
Laurent Destailleur
3dea950c24
Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
...
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
florian HENRY
dccddf5c7e
NEW : change render extrafields checkbox list for multiselectarray
2017-02-03 09:25:26 +01:00
Gustavo Novaro
f815d1bed3
Code style
2017-02-02 17:30:06 -03:00
atm-ph
ac20a1a874
Fix remove param htmlid in ajax_combobox
2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
phf
aea6a8f9ec
Fix (
2017-01-31 14:03:54 +01:00
phf
e73c60b526
New htmlid can be use instead of htmlname for select projects
2017-01-31 12:20:45 +01:00
Laurent Destailleur
756919de2a
Fix deadlock feature: could not solve a situation where an emailing was
...
validated by error.
2017-01-29 16:08:45 +01:00
atm-ph
ccad6d6dde
New show on project "overview" tab the informations about movements stock
2017-01-29 13:36:33 +01:00
Laurent Destailleur
fd90bf466b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9
FIX #6259
2017-01-28 15:01:17 +01:00
Laurent Destailleur
bc8ccd8ec5
Fix bad var set
2017-01-28 13:01:10 +01:00
florian HENRY
055a00a338
fix travis
2017-01-27 15:18:12 +01:00
florian HENRY
cb6209de31
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-27 15:16:28 +01:00
Laurent Destailleur
29df2c9115
Merge branch 'develop' into mail-lines
2017-01-27 01:29:58 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-27 01:24:55 +01:00
Laurent Destailleur
3c86507ce6
FIX #6328
2017-01-27 00:51:22 +01:00
Laurent Destailleur
1239e8600a
Merge pull request #6326 from altatof/fix_entity_thirdpart_files
...
Fix entity thirdparty files links
2017-01-27 00:30:03 +01:00
Laurent Destailleur
053afe21dd
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2017-01-26 23:40:16 +01:00
Laurent Destailleur
c1b59b1950
Fix several security bugs on expense report
2017-01-26 18:08:00 +01:00
Laurent Destailleur
c39fcce9f1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-26 10:45:38 +01:00
Laurent Destailleur
9889f0a4a2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modProjet.class.php
htdocs/filefunc.inc.php
2017-01-26 10:44:50 +01:00
florian HENRY
13917cebdc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild
2017-01-25 11:02:23 +01:00
altatof
d65cb29536
FIX: use param for http links
2017-01-25 09:25:06 +01:00
Laurent Destailleur
755d353dfa
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2017-01-24 18:40:01 +01:00
Laurent Destailleur
b1e5d8ce98
FIX Combo list of VAT is wrong on POS
2017-01-24 14:33:49 +01:00
Laurent Destailleur
f591e2b1b1
FIX Combo list of VAT is wrong on POS
2017-01-24 14:29:05 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7
Fix missing info admin picto. Fix colspan.
2017-01-23 17:31:39 +01:00
florian HENRY
d714a52f95
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-23 11:35:11 +01:00
Laurent Destailleur
7622d3b2fb
Fix missing info admin picto. Fix colspan.
2017-01-23 10:23:24 +01:00
Laurent Destailleur
daf40ed573
NEW Direct open of card after a search if on record only found.
2017-01-22 23:35:32 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284
Fix management of alternative language for Greek (el_CY)
2017-01-21 21:52:42 +01:00
Laurent Destailleur
b8a80f9311
Fix code comment and missing showLinkToObjectBlock hook declaration as
...
an addreplace hook.
2017-01-21 17:30:35 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
Laurent Destailleur
9a5670787f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-21 12:26:50 +01:00
Laurent Destailleur
fc4aa96cd7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
2017-01-20 21:02:05 +01:00
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
4047de82bd
Fix navigation on projects
2017-01-20 10:27:37 +01:00
Laurent Destailleur
03c1521cde
Merge pull request #6271 from altatof/fix_extra_input
...
FIX: extrafield input for varchar was not working with special char
2017-01-18 16:53:43 +01:00
Laurent Destailleur
562bdbc9f5
Merge pull request #6291 from gnovaro/patch-1
...
Improve code style
2017-01-18 16:44:56 +01:00
Laurent Destailleur
2566df8252
Merge pull request #6298 from benlo06/fix_shipping_contactid
...
FIX getIdContact for shipping
2017-01-18 15:53:32 +01:00
Benoit
73852beb4e
FIX contactid for shipping pdf
2017-01-17 21:55:21 +01:00
arnaud
39f35bbaab
FIX all dolibarr versions about project list and ajax completion bug
2017-01-17 11:17:40 +01:00
Gustavo Novaro
0f6cb52376
Improve code style
...
Replace var for public and private.
2017-01-16 17:40:13 -03:00
altatof
3dd160c663
use dol_escape_htmltag
2017-01-16 09:17:37 +01:00
Laurent Destailleur
36bd63c1a7
NEW PHP 7.1 compatibility
2017-01-16 09:05:18 +01:00
Laurent Destailleur
6bfd534a36
NEW PHP 7.1 compatibility
2017-01-16 01:21:33 +01:00
Laurent Destailleur
846e827e09
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
2017-01-16 00:48:37 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-16 00:01:37 +01:00
Regis Houssin
fd4a19855d
Fix: preview image not show with multicompany product sharing
2017-01-15 12:09:26 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
1fd9f5e1fb
Fix: host was twice into message id for smtp driver and swiftmailer was
...
not using dol_getprefix() to build host.
2017-01-14 13:27:44 +01:00
altatof
55c0a99bce
fix was not at the right place
2017-01-13 15:42:07 +01:00
altatof
487b5b25db
FIX: extrafield input for varchar was not working with special char
...
within (ie double quotes)
2017-01-13 15:37:33 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
5e71ff816f
Increase limit for better backward compatibility without loosing minimum
...
security.
2017-01-12 10:51:31 +01:00
Regis Houssin
5898d27609
Fix: avoid errors if constants values not exists
2017-01-11 16:47:17 +01:00
Laurent Destailleur
5553be4aa9
Fix code comment
2017-01-11 16:08:04 +01:00
Laurent Destailleur
1559c45a61
FIX link for not found photo when using gravatar. Must use external url
2017-01-10 09:24:55 +01:00
Laurent Destailleur
5c233a41b3
NEW Add hook "formatNotificationMessage"
2017-01-09 23:55:53 +01:00
Laurent Destailleur
93ab224614
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-09 23:33:36 +01:00
Laurent Destailleur
decbda3e23
Fix inversion application name - company name
2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27
Fix generic text must be set before specific for notification
2017-01-09 21:07:54 +01:00
Alexis Algoud
8b4a43ec77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-09 10:31:05 +01:00
Laurent Destailleur
51b9802de4
NEW Hook to allow inserting custom product head #6001
2017-01-07 20:42:35 +01:00
Laurent Destailleur
4c4aeba855
Fix project on loans
2017-01-07 17:54:47 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
e57f834434
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-04 17:06:02 +01:00
Laurent Destailleur
71e368aa83
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-04 17:04:25 +01:00
Laurent Destailleur
2aae4ea6ea
FIX We must not drop column if there is still record on other entities.
2017-01-04 15:05:13 +01:00
Alexis Algoud
370be70e46
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-03 16:30:50 +01:00
Ion Agorria
522fb4cf7a
Add email template for each line in object
2016-12-31 17:39:01 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Laurent Destailleur
f1961b0207
Work on sorting/indexing upload files
2016-12-31 03:43:22 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722
Several security fix in using mailings.
2016-12-26 12:35:10 +01:00
Laurent Destailleur
c9c8079c3d
Can add additionnal paramon mail to solve rare sendmail problems
2016-12-26 00:00:28 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
florian HENRY
337897e0a1
NEW : Allow extrafields list select to be dependands on other standard
...
list and not only other extrafields list
2016-12-23 15:01:49 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
Raphaël Doursenaud
ac92e23b59
[Qual] Optimize language file loading
...
Using fscanf() and the proper format is about twice as fast as
using fgets() followed by explode() and trim().
This is a small optimization per se but since this code is
called often it yields about 33% rendering time improvement on
the homepage where about 50% of the time is spent on loading the
translation files.
2016-12-23 01:11:50 +01:00
Laurent Destailleur
ba7ca3da6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
2016-12-22 17:57:42 +01:00
Laurent Destailleur
b4ed0a1e12
Fix nb of lat approvals wrong
2016-12-22 17:30:39 +01:00
Laurent Destailleur
081d3f0814
Quick hack by adding hidden constant to solve a locking feature (how to
...
add project if likned to another third on project view)
2016-12-22 16:52:03 +01:00
Laurent Destailleur
d66bc10d05
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84
Fix warning for approval delay.
2016-12-22 15:49:06 +01:00
Laurent Destailleur
77c320a092
Fix warning for expense report late
2016-12-22 15:33:43 +01:00
Laurent Destailleur
26098082d0
NEW Uploaded files are indexed into database
2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a
NEW Uploaded files are indexed into database
2016-12-20 19:42:25 +01:00
Laurent Destailleur
0ef963604f
Fix option moreinheader not correctly supported with smtps
2016-12-20 12:38:24 +01:00
Laurent Destailleur
3c79f3acb5
Minor fixes or code comment
2016-12-20 12:06:26 +01:00
Laurent Destailleur
be19a999f5
Fix regression losing warning on not defined emails
2016-12-19 18:11:53 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
0d1d68d5d9
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/price.php
2016-12-19 02:34:29 +01:00
Laurent Destailleur
74e00c4d80
More comment and hidden option to solve problems when sending emails.
2016-12-19 01:04:17 +01:00
Laurent Destailleur
dbf96b8f59
Log at wrong place
2016-12-18 23:32:31 +01:00
Laurent Destailleur
54aa8696ad
Fix regression
2016-12-18 13:01:26 +01:00
Laurent Destailleur
9d3bd9d36f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-12-18 11:57:04 +01:00
Laurent Destailleur
0988a2f173
Merge pull request #6187 from gnovaro/patch-5
...
var to public
2016-12-18 11:30:24 +01:00
Laurent Destailleur
3d57a457eb
Merge pull request #6176 from gnovaro/patch-2
...
Replace attributes var for public
2016-12-18 11:28:04 +01:00
Laurent Destailleur
4ece746437
Merge pull request #6168 from defrance/patch-61
...
FIX navigation field is always ref
2016-12-18 11:02:14 +01:00
Laurent Destailleur
27785323ae
Merge pull request #6164 from hregis/4.0_bug
...
Fix: missing date locale and date rfc
2016-12-18 10:57:29 +01:00
Laurent Destailleur
12e919b99d
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
...
Fix user right write margin
2016-12-18 10:53:34 +01:00
Laurent Destailleur
78bf209119
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-18 02:21:57 +01:00
Laurent Destailleur
394e284a4a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
2016-12-18 02:16:40 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
c5db333af8
Fix translation of error message when sending email
2016-12-17 14:00:39 +01:00
Gustavo Novaro
7728576f19
var to public
...
Improve code style
2016-12-17 03:49:28 -03:00
Alexis Algoud
f0ea610401
change date value
2016-12-16 17:06:05 +01:00
