Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
Laurent Destailleur
34fc04903a Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED, 
MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI, ...)
 2019-09-16 15:26:13 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Laurent Destailleur
0194f48041 Merge pull request #10795 from altatof/clonecat 
NEW : copy linked categories on product clone process
 2019-09-15 16:34:42 +02:00
Laurent Destailleur
eda17e9c54 Merge pull request #11850 from OPEN-DSI/new-stock-import-warehouse-parent 
NEW add parent id or ref column in warehouse import
 2019-09-15 15:44:33 +02:00
Laurent Destailleur
6bfba0b731 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2019-09-15 15:17:38 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
755057c99f FIX regression with option to hide picto on top menu 2019-09-15 15:15:46 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2 FIX regression with option to hide picto on top menu 2019-09-15 15:09:36 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Frédéric FRANCE
1e652a41af Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 18:41:51 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Frédéric FRANCE
e5417cccd8 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:40:00 +02:00
Laurent Destailleur
1d865a250e Merge pull request #11866 from bafbes/abb100076 
fix: repetition in error message
 2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14 Update ldap.class.php 2019-09-14 16:39:08 +02:00
Frédéric FRANCE
c9c7d60fc0 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Frédéric FRANCE
08f056a0f4 Delete interface_50_modIFTTT_IFTTT.class.php 
IFTTT has been removed
 2019-09-14 09:09:41 +02:00
Laurent Destailleur
aad6b003fb Add cache in fetch_optionnals() to avoid duplicate call to 
fetch_name_optionals_label
 2019-09-14 00:02:48 +02:00
florian HENRY
224b4c147a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df fix: fill id for links (document tab) 2019-09-13 15:25:16 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Frédéric FRANCE
0d3a2f800b fix colspan in show_project 2019-09-12 21:39:57 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
stickler-ci
b2187c829a Fixing style errors. 2019-09-11 22:44:17 +00:00
ATM john
bf924f113e Add more style ans edit button 2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Laurent Destailleur
5fd88f438f Clean code 2019-09-12 00:03:51 +02:00
Laurent Destailleur
d7d764e5f9 Fix var not defined 2019-09-11 23:56:53 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Abbes Bahfir
797bab4741 fix: repetition 2019-09-11 18:44:12 +01:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e More complete error message with hour/min/sec 2019-09-11 00:28:09 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
Laurent Destailleur
eb2f48332b Show first line of code 2019-09-10 15:58:56 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
VESSILLER
3ea2e0c915 NEW add parent id or ref column in warehouse import 2019-09-09 15:03:20 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
d3bc05de76 Merge pull request #11848 from atm-john/add_progress_to_global_task_list 
Add progress to global task list
 2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b Merge pull request #11846 from atm-john/fix_missing_total_progress 
Fix missing total progress column
 2019-09-09 13:07:10 +02:00