Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
74,589 Commits 36 Branches 190 Tags
198cf4af2fe0f7c5fff92f3385e48b51d1bb33b6
Commit Graph

6681 Commits

Author SHA1 Message Date
Josep Lluís
1c9ccc1442 Fix: add ID property to select objects 
Add ID property to select objects
I.e: id="select_'.$htmlname.'"
 2018-12-07 17:28:31 +01:00
aljawaid
292dd5290a Amend Add Access Keys in Navigation Tooltips 
- Fix travis
 2018-12-07 12:39:20 +00:00
AlainRnet
d8c600636c Update vcard.class.php 
update from vcard 2.1 to vcard 3.0
 2018-12-06 00:26:54 +01:00
IJ
8bd2efe648 NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT' 
- Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off
 2018-12-05 12:36:46 +00:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Alexandre SPANGARO
3b8dd71816 Remove public $db 2018-12-03 21:25:44 +01:00
Alexandre SPANGARO
0c6f6b80cb Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-03 21:16:53 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
07425e4e19 Merge pull request #10156 from grandoc/7.0_bug 
FIX #3234
 2018-12-02 17:06:06 +01:00
Alexandre SPANGARO
7eee155439 Correct documentation 2018-12-02 14:07:38 +01:00
IJ
30e84f8f2c Amend Add Access Keys in Navigation Tooltips 
- based on suggested code by @eldy
- Added `classfortooltip` for better display
 2018-12-02 10:29:04 +00:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
Inovea Conseil
18281d9d43 FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Maxime Kohlhaas
748dd12e4d Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
florian HENRY
faf7ea345f fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:23:46 +01:00
florian HENRY
dacc959937 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:18:51 +01:00
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
IJ
825f41bfda Add Access Keys in Navigation Tooltips 2018-11-27 00:22:21 +00:00
Laurent Destailleur
f0ab6e60ec FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
Laurent Destailleur
82b4b3ccb3 Merge pull request #10047 from frederic34/patch-9 
doc cmail class
 2018-11-24 11:20:49 +01:00
wdammak
5c9d5bb6ad order by category 2018-11-23 21:30:34 +01:00
wdammak
5c3daf4a6a order by category 2018-11-23 21:27:22 +01:00
wdammak
064816242a Order by category 2018-11-23 21:26:10 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Laurent Destailleur
b6dac7da20 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-21 15:40:15 +01:00
Frédéric FRANCE
4e60e48f34 Update CMailFile.class.php 2018-11-19 23:43:58 +01:00
Frédéric FRANCE
2179e2011e doc cmail class 2018-11-19 23:38:07 +01:00
Frédéric FRANCE
32706f570d reduce complexity of htmlformmail class 2018-11-19 21:19:39 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
8191df4857 Merge pull request #9962 from atm-john/fix_extrafield_view 
FIX hidden extrafield
 2018-11-19 18:37:18 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb Merge pull request #10041 from atm-ph/fix_8.0_optional_param 
Fix new params has been added not optional
 2018-11-19 18:26:21 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
François J
37f3b8bbde Update @since version to 9.0 2018-11-19 17:51:00 +01:00
François J
6aaf0f4655 Add afterSelectOptions hook & selectcontacts context 2018-11-19 17:40:16 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00