Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

5186 Commits

Author SHA1 Message Date
Laurent Destailleur
7e48db2869 Clean code 2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
f7ecac8734 Fix look and feel v7 2018-02-23 11:40:56 +01:00
Laurent Destailleur
b3d968d4a1 Fix look and feel v7 2018-02-23 11:40:20 +01:00
John
d0ef8fe75a fix travis errors 2018-02-22 09:54:36 +01:00
John
629b8e618e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-02-21 11:45:23 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
John
46b235c139 add auto select model when select type on create invoice 2018-02-20 15:08:57 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
Laurent Destailleur
e25bd56e22 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:16:06 +01:00
Laurent Destailleur
ec66bde3c9 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:15:24 +01:00
Rui Strecht
fd594f7e74 Fixed wrong global 2018-02-07 16:57:43 +00:00
Rui Strecht
f52beef3eb Added translation to company.php if MAIN_SHOW_REGION_IN_STATE_SELECT is activated 2018-02-07 16:54:21 +00:00
Rui Strecht
8c732a1443 Trying to not include sql request into method setMysoc 2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948 Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/core/class/commonobject.class.php
 2018-02-06 10:26:38 +00:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657 Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
Rui Strecht
b387c3fdf8 Forgot to update other files to same PR changes 2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744 Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2018-01-31 11:19:39 +00:00
Laurent Destailleur
8d983717a3 Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user 
NEW export filter models can be share or not by user
 2018-01-29 21:19:50 +01:00
Laurent Destailleur
a639308601 Fix css 2018-01-27 19:40:16 +01:00
Laurent Destailleur
28417a6c24 Fix css 2018-01-26 23:54:45 +01:00
Frédéric FRANCE
0568461a7b swiftmailer 2018-01-25 22:03:51 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year. 
Fix date are nto humanly readable.
 2018-01-25 12:57:36 +01:00
Laurent Destailleur
dfc7d47747 Fix message 2018-01-21 15:32:10 +01:00
atm-quentin
c2ee92d4f1 fix trans 2018-01-18 13:59:05 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
cc5dcde9e1 Fix protection to avoid errors 2018-01-14 18:55:55 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
9827358002 Merge pull request #8040 from atm-florian/dev_fixsecu 
fix #7963
 2018-01-11 00:44:45 +01:00
florian HENRY
0bd45dc64b fix: search translation into external module files also 2018-01-10 20:34:32 +01:00
Laurent Destailleur
bc9fc2828a Fix missing class 2018-01-10 10:42:36 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
Laurent Destailleur
da4417dfc8 Fix website in multicompany mode 2018-01-07 18:33:20 +01:00
Maxime Kohlhaas
a9c7dc48ab New option to force e-mail recipient, helpful for test purposes 2017-12-24 17:31:31 +01:00
Laurent Destailleur
e839c72109 Fix css 2017-12-22 14:05:49 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
9f2a42b67d NEW Can filter on user on unalterable log 2017-12-16 21:50:58 +01:00