Laurent Destailleur
|
fb13419de8
|
Merge pull request #7665 from dolibarr95/patch-26
Fix: missing logo in SQL and $companystatic
|
2017-10-22 02:43:19 +02:00 |
|
Laurent Destailleur
|
605c9c45e4
|
Merge pull request #7656 from atm-maxime/fix_accounting_mode
Fix #7584
|
2017-10-22 02:21:53 +02:00 |
|
Laurent Destailleur
|
4c58e4f98a
|
Update compta.php
|
2017-10-22 02:21:34 +02:00 |
|
Laurent Destailleur
|
210fb5206c
|
Update index.php
|
2017-10-22 02:21:04 +02:00 |
|
Laurent Destailleur
|
f4db4373ea
|
Update defaultaccounts.php
|
2017-10-22 02:20:29 +02:00 |
|
Laurent Destailleur
|
728e36f70f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
|
2017-10-22 01:43:33 +02:00 |
|
Laurent Destailleur
|
1afbf75cbc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/index.php
|
2017-10-22 01:30:25 +02:00 |
|
Laurent Destailleur
|
da8fe06301
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-22 01:26:17 +02:00 |
|
Laurent Destailleur
|
cad44ee68a
|
FIX substitution in ODT of thirdparties documents
|
2017-10-22 01:25:59 +02:00 |
|
Laurent Destailleur
|
99b88265d3
|
Fix larger select2 combo
|
2017-10-21 21:05:00 +02:00 |
|
Laurent Destailleur
|
475db3172a
|
NEW Remove js library fileupload that was not used by core code.
|
2017-10-21 19:40:17 +02:00 |
|
Laurent Destailleur
|
dbcf3ddbe8
|
NEW Upgrade jquery select2 to 4.0.4
|
2017-10-21 19:05:24 +02:00 |
|
Laurent Destailleur
|
270bd13f55
|
FIX Error when adding a bookmark after using an external GET bookmark
|
2017-10-21 14:52:58 +02:00 |
|
Laurent Destailleur
|
1426737a26
|
Work on website
|
2017-10-21 12:26:14 +02:00 |
|
Laurent Destailleur
|
e74aae18eb
|
CSS
|
2017-10-21 12:25:51 +02:00 |
|
Laurent Destailleur
|
19a5780f7f
|
Clean code
|
2017-10-20 23:49:20 +02:00 |
|
Laurent Destailleur
|
3bca0ad07d
|
More modern picto for switch on/off
Work on website module
|
2017-10-20 21:39:19 +02:00 |
|
Laurent Destailleur
|
0e397b3e81
|
Work on website module
|
2017-10-20 18:44:03 +02:00 |
|
Laurent Destailleur
|
ab4f5a3aea
|
Clean code
|
2017-10-20 18:15:43 +02:00 |
|
Laurent Destailleur
|
985675d680
|
Clean code
|
2017-10-20 18:04:46 +02:00 |
|
Laurent Destailleur
|
5c189449e1
|
Move default value for user expense report on tab expense report
|
2017-10-20 17:02:26 +02:00 |
|
Laurent Destailleur
|
6165bcdbd0
|
NEW Can export list of stock movements
|
2017-10-20 14:52:01 +02:00 |
|
dolibarr95
|
03eb69172e
|
logo
Add logo in sql and in $companystatic in order to load the picture in getNomUrl.
|
2017-10-20 09:17:18 +02:00 |
|
Laurent Destailleur
|
5b70468cac
|
Better translation
|
2017-10-20 04:25:49 +02:00 |
|
Laurent Destailleur
|
a16f0e4356
|
NEW The gantt diagram is now sensitive to hours
NEW Add a group task line for tasks on same level on gantt diagram
|
2017-10-20 04:15:44 +02:00 |
|
Laurent Destailleur
|
daa7847ab3
|
NEW All search boxes are available on smartphone
|
2017-10-20 01:18:21 +02:00 |
|
Laurent Destailleur
|
34d933af29
|
Default value for graph widget show all graphs
|
2017-10-20 00:27:52 +02:00 |
|
Laurent Destailleur
|
413807708f
|
Move translation key into main file
|
2017-10-19 20:59:36 +02:00 |
|
Laurent Destailleur
|
d82af57b57
|
NEW Add tab "Expense report" on user card
|
2017-10-19 20:56:23 +02:00 |
|
Laurent Destailleur
|
abd5251330
|
Better responsive
|
2017-10-19 19:53:29 +02:00 |
|
Laurent Destailleur
|
5e2d6620f2
|
Merge pull request #7655 from atm-maxime/new_eldy_sticky_menu
NEW option to fix top menu with eldy theme (hidden conf)
|
2017-10-19 19:29:07 +02:00 |
|
Laurent Destailleur
|
a1217d61b6
|
Merge pull request #7654 from simnandez/6.0
FIX: Bad localtax apply
|
2017-10-19 19:28:02 +02:00 |
|
Laurent Destailleur
|
fbc3be84e3
|
Merge pull request #7643 from atm-maxime/fix_dashboard_stats_links
Fix dashboard stats links
|
2017-10-19 19:26:49 +02:00 |
|
Laurent Destailleur
|
f1a0e13718
|
Merge pull request #7646 from atm-maxime/new_hrm_detailed_user
NEW hrm details output on user
|
2017-10-19 19:21:29 +02:00 |
|
Laurent Destailleur
|
f67350db72
|
Merge pull request #7647 from BackrndSource/patch-2
FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php
|
2017-10-19 19:19:21 +02:00 |
|
Laurent Destailleur
|
efaa0b1e2a
|
Merge pull request #7640 from atm-florian/6.0_fixeventiconstatus
fix : better icon for event status Non applicable
|
2017-10-19 19:18:56 +02:00 |
|
Laurent Destailleur
|
1202853001
|
Fix syntax error
|
2017-10-19 19:12:00 +02:00 |
|
Laurent Destailleur
|
f7556e7ad2
|
FIX make of link to other object during creation
|
2017-10-19 19:06:48 +02:00 |
|
Laurent Destailleur
|
d4ade7b935
|
FIX API to get object does not return data o flinked objects
|
2017-10-19 17:57:16 +02:00 |
|
Laurent Destailleur
|
e41dcd173e
|
Sync language
|
2017-10-19 17:55:24 +02:00 |
|
Laurent Destailleur
|
d7113a3602
|
Fix init of environment for a dedicated entity in API
|
2017-10-19 17:32:23 +02:00 |
|
Laurent Destailleur
|
8da7f789d8
|
Fix init of environment for a dedicated entity in API
|
2017-10-19 17:30:08 +02:00 |
|
Laurent Destailleur
|
83440f5bbc
|
FIX #7626
|
2017-10-19 13:07:33 +02:00 |
|
Laurent Destailleur
|
cb089987ee
|
Fix code comment
|
2017-10-19 12:35:15 +02:00 |
|
Laurent Destailleur
|
93d16bf4d7
|
Fix several fixes in APIs
|
2017-10-19 12:30:36 +02:00 |
|
Laurent Destailleur
|
9c45e86a1c
|
Introduce main_doc into table of objects to know what is main doc.
Work on option PROPOSAL_USE_ONLINE_SIGN
|
2017-10-19 11:40:40 +02:00 |
|
Laurent Destailleur
|
1b563dbf76
|
Rename table
|
2017-10-19 09:29:34 +02:00 |
|
Laurent Destailleur
|
30dad0be12
|
Split file of chart of account to prepare to load files after install
|
2017-10-19 09:28:59 +02:00 |
|
Laurent Destailleur
|
a818422302
|
Update jsgantt to 1.7.5.4
|
2017-10-18 21:24:17 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|